diff options
author | Gerald Carter <jerry@samba.org> | 2006-06-23 12:57:19 +0000 |
---|---|---|
committer | Gerald Carter <jerry@samba.org> | 2006-06-23 12:57:19 +0000 |
commit | dc011315bbe007fc995dc345b477b1e6af7ae83d (patch) | |
tree | 541af71a28e80d24215c15541c32e35789ee6e71 /source/nsswitch/winbindd_dual.c | |
parent | b30020d50197ce92a9146fe90288e953369d4c22 (diff) | |
download | samba-dc011315bbe007fc995dc345b477b1e6af7ae83d.tar.gz |
r16485: Final changes for 3.0.23rc3 (pulled in changes up to SAMBA_3_0 r16484)samba-3.0.23rc3
Diffstat (limited to 'source/nsswitch/winbindd_dual.c')
-rw-r--r-- | source/nsswitch/winbindd_dual.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/nsswitch/winbindd_dual.c b/source/nsswitch/winbindd_dual.c index 3003a314c03..0cc35277b05 100644 --- a/source/nsswitch/winbindd_dual.c +++ b/source/nsswitch/winbindd_dual.c @@ -649,6 +649,10 @@ static void child_msg_onlinestatus(int msg_type, struct process_id src, void *bu } message = collect_onlinestatus(mem_ctx); + if (message == NULL) { + talloc_destroy(mem_ctx); + return; + } message_send_pid(*sender, MSG_WINBIND_ONLINESTATUS, message, strlen(message) + 1, True); @@ -730,7 +734,7 @@ static BOOL fork_domain_child(struct winbindd_child *child) return False; } - if (child->domain != NULL) { + if (child->domain != NULL && lp_winbind_offline_logon()) { /* We might be in the idmap child...*/ child->lockout_policy_event = add_timed_event( child->mem_ctx, timeval_zero(), |