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

kdc: unused pid element is (pid_t)-1 not zero

Browse Source 
When the termination of a child process is observed by reap_kid() it
clears the pids[] element by assigning it the invalid pid value
(pid_t)-1. However, start_kdc() assumes that the unused pid[[] element
value is 0.  As a result, each pid[] element's associated child process
can only be restarted once since start_kdc() will not be able to locate
an unused element.

This change alters start_kdc() to initialize all elements of pids[] to
(pid_t)-1 and use that as the marker for unused elements.  By doing so
start_kdc() can properly record child process pids and indefinitely
restart child processes as necessary.

Change-Id: Ia93c9284ab21289994eca7fc9cf1278be7c00683
This commit is contained in:
Jeffrey Altman
2017-07-22 10:39:41 -04:00
committed by Nico Williams
parent b787491942
commit 237cd892d9
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
kdc/connect.c
View File

@@ -1122,9 +1122,11 @@ start_kdc(krb5_context context,
if (max_kdcs < 1) if (max_kdcs < 1)
max_kdcs = 1; max_kdcs = 1;
pids = calloc(max_kdcs, sizeof(*pids)); pids = malloc(max_kdcs * sizeof(*pids));
if (!pids) if (!pids)
krb5_err(context, 1, errno, "malloc"); krb5_err(context, 1, errno, "malloc");
for (i = 0; i < max_kdcs; i++)
pids[i] = (pid_t)-1;
/* /*
* We open a socketpair of which we hand one end to each of our kids. * We open a socketpair of which we hand one end to each of our kids.
@@ -1196,12 +1198,12 @@ start_kdc(krb5_context context,
sleep(10); sleep(10);
break; break;
default: default:
for (i=0; i < max_kdcs; i++) { for (i = 0; i < max_kdcs; i++) {
if (pids[i] == 0) { if (pids[i] == (pid_t)-1) {
pids[i] = pid; pids[i] = pid;
break; break;
} }
} }
kdc_log(context, config, 0, "KDC worker process started: %d", kdc_log(context, config, 0, "KDC worker process started: %d",
pid); pid);
num_kdcs++; num_kdcs++;