[PATCH 3/5] s4:winbind: Fix a misplaced returned info

Matthieu Patou mat at matws.net
Wed Mar 3 13:29:32 MST 2010


libwbclient expect to have in auth.exra_data the INFO3_TXT and in auth.unix_username the username
---
 source4/winbind/wb_samba3_cmd.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/source4/winbind/wb_samba3_cmd.c b/source4/winbind/wb_samba3_cmd.c
index 99980d2..2161c2f 100644
--- a/source4/winbind/wb_samba3_cmd.c
+++ b/source4/winbind/wb_samba3_cmd.c
@@ -676,8 +676,7 @@ static void pam_auth_crap_recv(struct composite_context *ctx)
 	}
 	
 	if (s3call->request.flags & WBFLAG_PAM_UNIX_NAME) {
-		s3call->response.extra_data.data = unix_username;
-		s3call->response.length += strlen(unix_username)+1;
+		WBSRV_SAMBA3_SET_STRING(s3call->response.data.auth.unix_username,unix_username);
 	}
 
  done:
@@ -769,8 +768,7 @@ static void pam_auth_recv(struct composite_context *ctx)
 	}
 	
 	if (s3call->request.flags & WBFLAG_PAM_UNIX_NAME) {
-		s3call->response.extra_data.data = unix_username;
-		s3call->response.length += strlen(unix_username)+1;
+		WBSRV_SAMBA3_SET_STRING(s3call->response.data.auth.unix_username,unix_username);
 	}
 	
 
-- 
1.6.3.3


--------------070804020605060400060206
Content-Type: text/x-patch;
 name="0005-s4-unittest-Fix-unittest-to-reflect-that-wbinfo-r-no.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename*0="0005-s4-unittest-Fix-unittest-to-reflect-that-wbinfo-r-no.pa";
 filename*1="tch"



More information about the samba-technical mailing list