From: Sam Hartman <hartmans@mit.edu>
Date: Thu, 29 Jun 1995 18:58:21 +0000 (+0000)
Subject: ----------------------------------------------------------------------
X-Git-Tag: krb5-1.0-beta6~1615
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e3dcc50ba46067ab87291a73e4cff2396b761dc9;p=krb5.git

----------------------------------------------------------------------
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
---

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) {