kdb5_mkdums.c: Create principals with correct realm name

configure.in: Look for ndbm or dbm libraries

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@4555 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/tests/create/ChangeLog b/src/tests/create/ChangeLog
index bcc3ca1c5d6b7d41fe8549373260ae1431da1143..179840f24f273a46ecf88fa9af652f529911dae0 100644 (file)
--- a/src/tests/create/ChangeLog
+++ b/src/tests/create/ChangeLog
@@ -1,3 +1,10 @@
+Sun Oct 23 00:50:07 1994    (tytso@rsx-11)
+
+       * kdb5_mkdums.c (add_princ): Create principals with correct realm
+               name. 
+
+       * configure.in: Look for ndbm or dbm libraries
+
 Thu Oct  6 12:41:28 1994  Theodore Y. Ts'o  (tytso@dcl)
 
        * kdb5_mkdums.c (main, set_dbname_help): Allow master key password

diff --git a/src/tests/create/configure.in b/src/tests/create/configure.in
index 8f48de8532967aa458c96329d0db350128c55912..1c1902c44e80e38d0907cc793476c5b1f7f36a58 100644 (file)
--- a/src/tests/create/configure.in
+++ b/src/tests/create/configure.in
@@ -5,6 +5,8 @@ AC_SET_BUILDTOP
 AC_PROG_INSTALL
 AC_HAVE_LIBRARY(socket)
 AC_HAVE_LIBRARY(nsl)
+AC_HAVE_LIBRARY(-lndbm)
+AC_HAVE_LIBRARY(-ldbm)
 KRB_INCLUDE
 ISODE_INCLUDE
 WITH_KRB5ROOT

diff --git a/src/tests/create/kdb5_mkdums.c b/src/tests/create/kdb5_mkdums.c
index 5edb4ffbce24d24c90027cc89aff3871e8b42de7..f4fea5110dac7d95e56201c8da0c67eed4eaded1 100644 (file)
--- a/src/tests/create/kdb5_mkdums.c
+++ b/src/tests/create/kdb5_mkdums.c
@@ -250,17 +250,20 @@ OLDDECLARG(char *, str_newprinc)
     krb5_keyblock key;
     krb5_data pwd, salt;
     krb5_principal newprinc;
+    char princ_name[4096];
 
-    if (retval = krb5_parse_name(str_newprinc, &newprinc)) {
-      com_err(progname, retval, "while parsing '%s'", str_newprinc);
+    sprintf(princ_name, "%s@%s", str_newprinc, cur_realm);
+    
+    if (retval = krb5_parse_name(princ_name, &newprinc)) {
+      com_err(progname, retval, "while parsing '%s'", princ_name);
       return;
     }
 
-    pwd.data = str_newprinc;  /* must be able to regenerate */
-    pwd.length = strlen(str_newprinc);
+    pwd.data = princ_name;  /* must be able to regenerate */
+    pwd.length = strlen(princ_name);
 
     if (retval = krb5_principal2salt(newprinc, &salt)) {
-       com_err(progname, retval, "while converting principal to salt for '%s'", str_newprinc);
+       com_err(progname, retval, "while converting principal to salt for '%s'", princ_name);
        return;
     }
 
@@ -269,7 +272,7 @@ OLDDECLARG(char *, str_newprinc)
                                &pwd,
                                &salt);
     if (retval) {
-       com_err(progname, retval, "while converting password to key for '%s'", str_newprinc);
+       com_err(progname, retval, "while converting password to key for '%s'", princ_name);
        return;
     }
 
@@ -277,7 +280,7 @@ OLDDECLARG(char *, str_newprinc)
                                  &key,
                                  &newentry.key);
     if (retval) {
-       com_err(progname, retval, "while encrypting key for '%s'", str_newprinc);
+       com_err(progname, retval, "while encrypting key for '%s'", princ_name);
        return;
     }
 
@@ -312,10 +315,10 @@ OLDDECLARG(char *, str_newprinc)
        free((char *)newentry.key.contents);
        return;
     }
-    fprintf(stdout, "Added %s ...\n", str_newprinc);
+    fprintf(stdout, "Added %s ...\n", princ_name);
     free((char *)newentry.key.contents);
     if (retval) {
-       com_err(progname, retval, "while storing entry for '%s'\n", str_newprinc);
+       com_err(progname, retval, "while storing entry for '%s'\n", princ_name);
        return;
     }
     if (one != 1)