git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@2600 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1997-07-24 07:44:38 +00:00
parent b07396da72
commit 0dc0eda884

View File

@@ -41,10 +41,11 @@
RCSID("$Id$"); RCSID("$Id$");
static char *config_file = NULL; static char *config_file;
char *logfile = NULL; char *logfile;
int loglevel = -2; int loglevel = -2;
int require_preauth = 1; int require_preauth = 1;
char *keyfile;
static int help; static int help;
@@ -65,6 +66,10 @@ static struct getargs args[] = {
"require-preauth", 'p', arg_negative_flag, &require_preauth, "require-preauth", 'p', arg_negative_flag, &require_preauth,
"don't require pa-data in as-reqs" "don't require pa-data in as-reqs"
}, },
{
"key-file", 'k', arg_string, &keyfile,
"location of master key file", "file"
},
{ "help", 'h', arg_flag, &help }, { "help", 'h', arg_flag, &help },
}; };
@@ -112,6 +117,15 @@ configure(int argc, char **argv)
loglevel = atoi(p); loglevel = atoi(p);
} }
if(keyfile == NULL){
p = krb5_config_get_string (cf,
"kdc",
"key-file",
NULL);
if(p)
keyfile = strdup(p);
}
if(require_preauth == -1){ if(require_preauth == -1){
p = krb5_config_get_string (cf, p = krb5_config_get_string (cf,
"kdc", "kdc",