mirror of
https://github.com/samba-team/samba.git
synced 2024-12-23 17:34:34 +03:00
r18937: Protect against segc in the idmap winbindd child process
(the domain is NULL here)
This commit is contained in:
parent
1f09e54fec
commit
a36de910d2
@ -766,7 +766,9 @@ static BOOL fork_domain_child(struct winbindd_child *child)
|
|||||||
message_register(MSG_WINBIND_ONLINE,child_msg_online);
|
message_register(MSG_WINBIND_ONLINE,child_msg_online);
|
||||||
message_register(MSG_WINBIND_ONLINESTATUS,child_msg_onlinestatus);
|
message_register(MSG_WINBIND_ONLINESTATUS,child_msg_onlinestatus);
|
||||||
|
|
||||||
child->domain->startup = True;
|
if ( child->domain ) {
|
||||||
|
child->domain->startup = True;
|
||||||
|
}
|
||||||
startup_time = time(NULL);
|
startup_time = time(NULL);
|
||||||
|
|
||||||
while (1) {
|
while (1) {
|
||||||
@ -785,7 +787,7 @@ static BOOL fork_domain_child(struct winbindd_child *child)
|
|||||||
|
|
||||||
GetTimeOfDay(&now);
|
GetTimeOfDay(&now);
|
||||||
|
|
||||||
if (child->domain->startup && (now.tv_sec > startup_time + 30)) {
|
if (child->domain && child->domain->startup && (now.tv_sec > startup_time + 30)) {
|
||||||
/* No longer in "startup" mode. */
|
/* No longer in "startup" mode. */
|
||||||
DEBUG(10,("fork_domain_child: domain %s no longer in 'startup' mode.\n",
|
DEBUG(10,("fork_domain_child: domain %s no longer in 'startup' mode.\n",
|
||||||
child->domain->name ));
|
child->domain->name ));
|
||||||
|
Loading…
Reference in New Issue
Block a user