svn commit: samba r13861 - branches/SAMBA_3_0/source/utils trunk/source/utils

gd at samba.org gd at samba.org
Mon Mar 6 14:55:27 GMT 2006


Author: gd
Date: 2006-03-06 14:55:27 +0000 (Mon, 06 Mar 2006)
New Revision: 13861

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

Log:
Avoid "net rpc join" segfaulting when storing the servername in the
affinity cache.

Guenther

Modified:
   branches/SAMBA_3_0/source/utils/net.c
   trunk/source/utils/net.c


Changeset:
Modified: branches/SAMBA_3_0/source/utils/net.c
===================================================================
--- branches/SAMBA_3_0/source/utils/net.c	2006-03-06 14:19:11 UTC (rev 13860)
+++ branches/SAMBA_3_0/source/utils/net.c	2006-03-06 14:55:27 UTC (rev 13861)
@@ -397,7 +397,7 @@
 
 	/* store the server in the affinity cache if it was a PDC */
 
-	if ( flags & NET_FLAGS_PDC )
+	if ( (flags & NET_FLAGS_PDC) && NT_STATUS_IS_OK(nt_status) )
 		saf_store( cli->server_domain, cli->desthost );
 
 	SAFE_FREE(server_name);

Modified: trunk/source/utils/net.c
===================================================================
--- trunk/source/utils/net.c	2006-03-06 14:19:11 UTC (rev 13860)
+++ trunk/source/utils/net.c	2006-03-06 14:55:27 UTC (rev 13861)
@@ -397,7 +397,7 @@
 
 	/* store the server in the affinity cache if it was a PDC */
 
-	if ( flags & NET_FLAGS_PDC )
+	if ( (flags & NET_FLAGS_PDC) && NT_STATUS_IS_OK(nt_status) )
 		saf_store( cli->server_domain, cli->desthost );
 
 	SAFE_FREE(server_name);



More information about the samba-cvs mailing list