diff options
| author | Kevin Mitchell <klmitch@mit.edu> | 1996-09-27 20:04:07 +0000 |
|---|---|---|
| committer | Kevin Mitchell <klmitch@mit.edu> | 1996-09-27 20:04:07 +0000 |
| commit | 71e6293b4c1153f2daf42261875ebd450900c38c (patch) | |
| tree | ef8654f082c87fd974a4198d565f0d14becc07d2 /src/slave | |
| parent | 589080b34a60e2986c0db82e6260325441819a3f (diff) | |
| download | krb5-71e6293b4c1153f2daf42261875ebd450900c38c.tar.gz krb5-71e6293b4c1153f2daf42261875ebd450900c38c.tar.xz krb5-71e6293b4c1153f2daf42261875ebd450900c38c.zip | |
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
Diffstat (limited to 'src/slave')
| -rw-r--r-- | src/slave/kpropd.c | 8 |
1 files changed, 5 insertions, 3 deletions
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; |