Change DEFAULT_DBM_FILE to DEFAULT_KDB_FILE

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

diff --git a/src/admin/create/kdb5_create.c b/src/admin/create/kdb5_create.c
index 9d1069025bd6f2b6f0ef26fea3ac295aa1ef6076..e7128882d1e10721147c0175b1f60b8933f6af42 100644 (file)
--- a/src/admin/create/kdb5_create.c
+++ b/src/admin/create/kdb5_create.c
@@ -128,7 +128,7 @@ char *argv[];
     int optchar;
 
     krb5_error_code retval;
-    char *dbname = 0;
+    char *dbname = DEFAULT_KDB_FILE;
     char *realm = 0;
     char *mkey_name = 0;
     char *mkey_fullname;
@@ -187,9 +187,6 @@ char *argv[];
     }
     krb5_use_cstype(&master_encblock, etype);
 
-    if (!dbname)
-       dbname = DEFAULT_DBM_FILE;      /* XXX? */
-
     retval = krb5_db_set_name(dbname);
     if (!retval) retval = EEXIST;
 

diff --git a/src/admin/destroy/kdb5_destroy.c b/src/admin/destroy/kdb5_destroy.c
index 3057e77ab9847a070097b6da8c178663ef0c6d8b..b890a872bf3098cde009d57ebfc8e11e85af853c 100644 (file)
--- a/src/admin/destroy/kdb5_destroy.c
+++ b/src/admin/destroy/kdb5_destroy.c
@@ -62,7 +62,7 @@ char *argv[];
 {
     extern char *optarg;       
     int optchar;
-    char *dbname = 0;
+    char *dbname = DEFAULT_KDB_FILE;
     char buf[5];
     char dbfilename[MAXPATHLEN];
     krb5_error_code retval;
@@ -85,9 +85,6 @@ char *argv[];
            /*NOTREACHED*/
        }
     }
-    if (!dbname)
-       dbname = DEFAULT_DBM_FILE;      /* XXX? */
-
     printf("Deleting KDC database stored in '%s', are you sure?\n", dbname);
     printf("(type 'yes' to confirm)? ");
     if ((fgets(buf, sizeof(buf), stdin) != NULL) && /* typed something */

diff --git a/src/admin/stash/kdb5_stash.c b/src/admin/stash/kdb5_stash.c
index b97967b94218b67530c815402c66eeafd2b6e6bc..3b9839df345a599b1a6fa8877c9cc9233abcea06 100644 (file)
--- a/src/admin/stash/kdb5_stash.c
+++ b/src/admin/stash/kdb5_stash.c
@@ -36,6 +36,7 @@ static char rcsid_kdb_stash_c[] =
 #include <krb5/ext-proto.h>
 #include <krb5/los-proto.h>
 #include <krb5/sysincl.h>
+#include <krb5/osconf.h>
 
 #include <com_err.h>
 #include <stdio.h>
@@ -67,7 +68,7 @@ char *argv[];
     extern char *optarg;
     int optchar;
     krb5_error_code retval;
-    char *dbname = 0;
+    char *dbname = DEFAULT_KDB_FILE;
     char *realm = 0;
     char *mkey_name = 0;
     char *mkey_fullname;
@@ -131,9 +132,6 @@ char *argv[];
 
     krb5_use_cstype(&master_encblock, etype);
 
-    if (!dbname)
-       dbname = DEFAULT_DBM_FILE;      /* XXX? */
-
     if (retval = krb5_db_set_name(dbname)) {
        com_err(argv[0], retval, "while setting active database to '%s'",
                dbname);