svn commit: samba r19300 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_23/source/nsswitch

[jra at samba.org]

Author: jra
Date: 2006-10-16 00:00:32 +0000 (Mon, 16 Oct 2006)
New Revision: 19300

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

Log:
Fix null deref in debug statement.
Jeremy.

Modified:
   branches/SAMBA_3_0/source/nsswitch/winbindd_user.c
   branches/SAMBA_3_0_23/source/nsswitch/winbindd_user.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_user.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/winbindd_user.c	2006-10-15 23:14:19 UTC (rev 19299)
+++ branches/SAMBA_3_0/source/nsswitch/winbindd_user.c	2006-10-16 00:00:32 UTC (rev 19300)
@@ -193,7 +193,7 @@
 {
 	struct getpwsid_state *s;
 
-	s = TALLOC_P(state->mem_ctx, struct getpwsid_state);
+	s = TALLOC_ZERO_P(state->mem_ctx, struct getpwsid_state);
 	if (s == NULL) {
 		DEBUG(0, ("talloc failed\n"));
 		goto error;
@@ -229,8 +229,8 @@
 		talloc_get_type_abort(private_data, struct getpwsid_state);
 
 	if (!success) {
-		DEBUG(5, ("Could not query user %s\\%s\n", s->domain->name,
-			  s->username));
+		DEBUG(5, ("Could not query user %s SID %s\n", s->domain->name,
+			  sid_string_static(&s->user_sid)));
 		request_error(s->state);
 		return;
 	}

Modified: branches/SAMBA_3_0_23/source/nsswitch/winbindd_user.c
===================================================================
--- branches/SAMBA_3_0_23/source/nsswitch/winbindd_user.c	2006-10-15 23:14:19 UTC (rev 19299)
+++ branches/SAMBA_3_0_23/source/nsswitch/winbindd_user.c	2006-10-16 00:00:32 UTC (rev 19300)
@@ -199,7 +199,7 @@
 {
 	struct getpwsid_state *s;
 
-	s = TALLOC_P(state->mem_ctx, struct getpwsid_state);
+	s = TALLOC_ZERO_P(state->mem_ctx, struct getpwsid_state);
 	if (s == NULL) {
 		DEBUG(0, ("talloc failed\n"));
 		goto error;
@@ -235,8 +235,8 @@
 		talloc_get_type_abort(private_data, struct getpwsid_state);
 
 	if (!success) {
-		DEBUG(5, ("Could not query user %s\\%s\n", s->domain->name,
-			  s->username));
+		DEBUG(5, ("Could not query user %s SID %s\n", s->domain->name,
+			  sid_string_static(&s->user_sid)));
 		request_error(s->state);
 		return;
 	}