diff options
Diffstat (limited to 'kerberosV/src/lib/kadm5/dump_log.c')
| -rw-r--r-- | kerberosV/src/lib/kadm5/dump_log.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/kerberosV/src/lib/kadm5/dump_log.c b/kerberosV/src/lib/kadm5/dump_log.c index 378433e1b2b..8446bdb2dbe 100644 --- a/kerberosV/src/lib/kadm5/dump_log.c +++ b/kerberosV/src/lib/kadm5/dump_log.c @@ -34,7 +34,7 @@ #include "iprop.h" #include "parse_time.h" -RCSID("$KTH: dump_log.c,v 1.13 2003/04/16 17:56:02 lha Exp $"); +RCSID("$KTH: dump_log.c,v 1.16 2005/04/25 18:17:51 lha Exp $"); static char *op_names[] = { "get", @@ -150,7 +150,7 @@ print_entry(kadm5_server_context *server_context, } if(mask & KADM5_ATTRIBUTES) { unparse_flags(HDBFlags2int(ent.flags), - HDBFlags_units, t, sizeof(t)); + asn1_HDBFlags_units(), t, sizeof(t)); printf(" attributes = %s\n", t); } if(mask & KADM5_MAX_LIFE) { @@ -214,10 +214,12 @@ print_entry(kadm5_server_context *server_context, } static char *realm; +static char *config_file; static int version_flag; static int help_flag; static struct getargs args[] = { + { "config-file", 'c', arg_string, &config_file }, { "realm", 'r', arg_string, &realm }, { "version", 0, arg_flag, &version_flag }, { "help", 0, arg_flag, &help_flag } @@ -232,6 +234,7 @@ main(int argc, char **argv) void *kadm_handle; kadm5_server_context *server_context; kadm5_config_params conf; + char **files; krb5_program_setup(&context, argc, argv, args, num_args, NULL); @@ -242,6 +245,18 @@ main(int argc, char **argv) exit(0); } + if (config_file == NULL) + config_file = HDB_DB_DIR "/kdc.conf"; + + ret = krb5_prepend_config_files_default(config_file, &files); + if (ret) + krb5_err(context, 1, ret, "getting configuration files"); + + ret = krb5_set_config_files(context, files); + krb5_free_config_files(files); + if (ret) + krb5_err(context, 1, ret, "reading configuration files"); + memset(&conf, 0, sizeof(conf)); if(realm) { conf.mask |= KADM5_CONFIG_REALM; |