From: Bo Yang <boyang@samba.org>
Date: Fri, 7 Aug 2009 22:10:37 +0000 (+0800)
Subject: s3: Fix nss info substitution
X-Git-Tag: talloc-2.0.0~464^2~37
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b9fb8da59148f574b03e44748fca7800f940db7a;p=thirdparty%2Fsamba.git

s3: Fix nss info substitution

Signed-off-by: Bo Yang <boyang@samba.org>
---

diff --git a/source3/winbindd/wb_getpwsid.c b/source3/winbindd/wb_getpwsid.c
index a823ba3953f..fc696cb9a18 100644
--- a/source3/winbindd/wb_getpwsid.c
+++ b/source3/winbindd/wb_getpwsid.c
@@ -191,7 +191,7 @@ static void wb_getpwsid_sid2gid_done(struct tevent_req *subreq)
 	fstrcpy(state->pw->pw_passwd, "*");
 	fstrcpy(state->pw->pw_gecos, state->userinfo->full_name);
 
-	if (!fillup_pw_field(lp_template_homedir(), state->pw->pw_name,
+	if (!fillup_pw_field(lp_template_homedir(), username,
 			     state->user_domain->name, state->pw->pw_uid,
 			     state->pw->pw_gid, state->userinfo->homedir,
 			     state->pw->pw_dir)) {
@@ -200,9 +200,9 @@ static void wb_getpwsid_sid2gid_done(struct tevent_req *subreq)
 		return;
 	}
 
-	if (!fillup_pw_field(lp_template_homedir(), state->pw->pw_name,
+	if (!fillup_pw_field(lp_template_shell(), state->pw->pw_name,
 			     state->user_domain->name, state->pw->pw_uid,
-			     state->pw->pw_gid, state->userinfo->homedir,
+			     state->pw->pw_gid, state->userinfo->shell,
 			     state->pw->pw_shell)) {
 		DEBUG(5, ("Could not compose shell\n"));
 		tevent_req_nterror(req, NT_STATUS_NO_MEMORY);