oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

KDC: Don't confuse master process with master

Browse Source
This commit is contained in:
Nicolas Williams
2016-01-20 15:17:06 -06:00
parent a6e36356b5
commit 1575f4f69a
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
kdc/connect.c
View File

@@ -952,7 +952,7 @@ loop(krb5_context context, krb5_kdc_configuration *config,
switch (exit_flag) { switch (exit_flag) {
case -1: case -1:
kdc_log(context, config, 0, kdc_log(context, config, 0,
"KDC worker process exiting because Master KDC exited."); "KDC worker process exiting because KDC master exited.");
break; break;
#ifdef SIGXCPU #ifdef SIGXCPU
case SIGXCPU: case SIGXCPU:
@@ -1019,7 +1019,7 @@ reap_kid(krb5_context context, krb5_kdc_configuration *config,
} }
/* XXXrcd: should likely log exit code and the like */ /* XXXrcd: should likely log exit code and the like */
kdc_log(context, config, 0, "sub-KDC reaped: %d", pid); kdc_log(context, config, 0, "KDC worker process reaped: %d", pid);
pids[i] = (pid_t)-1; pids[i] = (pid_t)-1;
return 1; return 1;
@@ -1103,8 +1103,7 @@ start_kdc(krb5_context context,
bonjour_kid(context, config, islive[1]); /* fork()s */ bonjour_kid(context, config, islive[1]); /* fork()s */
#endif #endif
kdc_log(context, config, 0, "KDC started master process pid=%d", getpid());
kdc_log(context, config, 0, "Master KDC started pid=%d", getpid());
#else #else
kdc_log(context, config, 0, "KDC started pid=%d", getpid()); kdc_log(context, config, 0, "KDC started pid=%d", getpid());
#endif #endif
@@ -1154,7 +1153,7 @@ start_kdc(krb5_context context,
if (pids[i] == 0) if (pids[i] == 0)
break; break;
pids[i] = pid; pids[i] = pid;
kdc_log(context, config, 0, "sub-KDC started: %d", pid); kdc_log(context, config, 0, "KDC worker process started: %d", pid);
num_kdcs++; num_kdcs++;
gettimeofday(&tv1, NULL); gettimeofday(&tv1, NULL);
break; break;
@@ -1194,7 +1193,7 @@ start_kdc(krb5_context context,
break; break;
} }
kdc_log(context, config, 0, "master KDC exiting", pid); kdc_log(context, config, 0, "KDC master process exiting", pid);
#else #else
loop(context, config, d, ndescr, -1); loop(context, config, d, ndescr, -1);
kdc_log(context, config, 0, "KDC exiting", pid); kdc_log(context, config, 0, "KDC exiting", pid);