svn commit: samba r11368 - branches/SAMBA_3_0/source/nsswitch trunk/source/nsswitch

[vlendec at samba.org]

Author: vlendec
Date: 2005-10-28 09:15:27 +0000 (Fri, 28 Oct 2005)
New Revision: 11368

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11368

Log:
Remove a memleak that just cost me half an hour: If we terminate inside a
message handler, the list of messages from retrieve_all_messages is not
properly freed. Not important, just confusing :-)

Volker

Modified:
   branches/SAMBA_3_0/source/nsswitch/winbindd.c
   trunk/source/nsswitch/winbindd.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd.c	2005-10-28 09:14:16 UTC (rev 11367)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd.c	2005-10-28 09:15:27 UTC (rev 11368)
@@ -213,7 +213,7 @@
 /* React on 'smbcontrol winbindd shutdown' in the same way as on SIGTERM*/
 static void msg_shutdown(int msg_type, struct process_id src, void *buf, size_t len)
 {
-	terminate();
+	do_sigterm = True;
 }
 
 static struct winbindd_dispatch_table {

Modified: trunk/source/nsswitch/winbindd.c
===================================================================
--- trunk/source/nsswitch/winbindd.c	2005-10-28 09:14:16 UTC (rev 11367)
+++ trunk/source/nsswitch/winbindd.c	2005-10-28 09:15:27 UTC (rev 11368)
@@ -213,7 +213,7 @@
 /* React on 'smbcontrol winbindd shutdown' in the same way as on SIGTERM*/
 static void msg_shutdown(int msg_type, struct process_id src, void *buf, size_t len)
 {
-	terminate();
+	do_sigterm = True;
 }
 
 static struct winbindd_dispatch_table {