From: Kevin Mitchell <klmitch@mit.edu>
Date: Fri, 27 Sep 1996 20:04:07 +0000 (+0000)
Subject: don't give kdb5_util the -d option unless kpropd is given -F
X-Git-Tag: krb5-1.0-freeze1~293
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=71e6293b4c1153f2daf42261875ebd450900c38c;p=krb5.git

don't give kdb5_util the -d option unless kpropd is given -F

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

diff --git a/src/slave/kpropd.c b/src/slave/kpropd.c
index 1170b8301..f4aad5766 100644
--- a/src/slave/kpropd.c
+++ b/src/slave/kpropd.c
@@ -73,7 +73,7 @@ char	*realm = NULL;		/* Our realm */
 char	*file = KPROPD_DEFAULT_FILE;
 char	*temp_file_name;
 char	*kdb5_util = KPROPD_DEFAULT_KDB5_UTIL;
-char	*kerb_database = KPROPD_DEFAULT_KRB_DB;
+char	*kerb_database = NULL;
 char	*acl_file_name = KPROPD_ACL_FILE;
 
 int		database_fd;
@@ -835,8 +835,10 @@ load_database(context, kdb5_util, database_file_name)
 		edit_av[count++] = realm;	
 	}
 	edit_av[count++] = "load";
-	edit_av[count++] = "-d";
-	edit_av[count++] = kerb_database;
+	if (kerb_database) {
+		edit_av[count++] = "-d";
+		edit_av[count++] = kerb_database;
+	}
 	edit_av[count++] = database_file_name;
 	edit_av[count++] = NULL;