diff options
| author | Sam Hartman <hartmans@mit.edu> | 1995-06-29 18:58:21 +0000 |
|---|---|---|
| committer | Sam Hartman <hartmans@mit.edu> | 1995-06-29 18:58:21 +0000 |
| commit | e3dcc50ba46067ab87291a73e4cff2396b761dc9 (patch) | |
| tree | 68593f87a129484f9835d554510b65fe7505ec13 /src/kadmin/v5server | |
| parent | a800a2fa7e3b74bc90f65c921f5ce815cd3fd5e1 (diff) | |
| download | krb5-e3dcc50ba46067ab87291a73e4cff2396b761dc9.tar.gz krb5-e3dcc50ba46067ab87291a73e4cff2396b761dc9.tar.xz krb5-e3dcc50ba46067ab87291a73e4cff2396b761dc9.zip | |
----------------------------------------------------------------------
automatically CVS: CVS: Committing in . CVS: CVS: Modified Files:
----------------------------------------------------------------------
Input the master key before daemoning if you're going to detach. This
makes kadmind5 -m useful without -n as well.
CVS:
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6200 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin/v5server')
| -rw-r--r-- | src/kadmin/v5server/ChangeLog | 3 | ||||
| -rw-r--r-- | src/kadmin/v5server/srv_main.c | 12 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/kadmin/v5server/ChangeLog b/src/kadmin/v5server/ChangeLog index 615c8da73..11169ef5c 100644 --- a/src/kadmin/v5server/ChangeLog +++ b/src/kadmin/v5server/ChangeLog @@ -1,3 +1,6 @@ +Tue Jun 27 18:14:33 1995 Sam Hartman <hartmans@tardis.MIT.EDU> + + * srv_main.c (main): Rearrange code so that we ask for the master key *before* we detach from the controlling terminal. This causes the Kerberos context to be initialized in the parent before the fork; I'm not sure if this is acceptable or not. Tue Jun 27 16:02:24 EDT 1995 Paul Park (pjpark@mit.edu) * srv_net.c, srv_acl.c, proto_serv.c - Add signal name parameter to diff --git a/src/kadmin/v5server/srv_main.c b/src/kadmin/v5server/srv_main.c index fe11a5f41..4cb1a3e71 100644 --- a/src/kadmin/v5server/srv_main.c +++ b/src/kadmin/v5server/srv_main.c @@ -204,6 +204,12 @@ main(argc, argv) usage(argv[0]); return(1); } + krb5_init_context(&kcontext); + krb5_init_ets(kcontext); + krb5_klog_init(kcontext, "admin_server", programname, 1); + error = key_init(kcontext, debug_level, enc_type, key_type, + master_key_name, manual_entry, db_file, db_realm, + keytab_name); #ifndef DEBUG /* @@ -229,9 +235,6 @@ main(argc, argv) #else /* DEBUG */ programname = argv[0]; #endif /* DEBUG */ - krb5_init_context(&kcontext); - krb5_init_ets(kcontext); - krb5_klog_init(kcontext, "admin_server", programname, 1); if ((signal_number = #if POSIX_SETJMP @@ -271,9 +274,6 @@ main(argc, argv) /* * Initialize our modules. */ - error = key_init(kcontext, debug_level, enc_type, key_type, - master_key_name, manual_entry, db_file, db_realm, - keytab_name); if (!error) { error = acl_init(kcontext, debug_level, acl_file); if (!error) { |