From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 8 Nov 2004 04:32:23 +0000 (+0000)
Subject: r3616: Merge for 3.0.8.
X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~5632
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cb27c197ee44d2be09014598e3928642b59ef956;p=thirdparty%2Fsamba.git

r3616: Merge for 3.0.8.

In auth_winbind, remove the push_utf8 calls, as this is no longer a
UTF8 interface.  (Removed from everywhere else earlier).

Tested with ASCII - I tried to load the weird charset for testing, but
it doesn't seem to work any more.

Andrew Bartlett
---

diff --git a/source/auth/auth_winbind.c b/source/auth/auth_winbind.c
index 4260a0e80b4..78235d30fce 100644
--- a/source/auth/auth_winbind.c
+++ b/source/auth/auth_winbind.c
@@ -88,11 +88,11 @@ static NTSTATUS check_winbind_security(const struct auth_context *auth_context,
 
 	request.flags = WBFLAG_PAM_INFO3_NDR;
 
-	push_utf8_fstring(request.data.auth_crap.user, 
+	fstrcpy(request.data.auth_crap.user, 
 			  user_info->smb_name.str);
-	push_utf8_fstring(request.data.auth_crap.domain, 
+	fstrcpy(request.data.auth_crap.domain, 
 			  user_info->domain.str);
-	push_utf8_fstring(request.data.auth_crap.workstation, 
+	fstrcpy(request.data.auth_crap.workstation, 
 			  user_info->wksta_name.str);
 
 	memcpy(request.data.auth_crap.chal, auth_context->challenge.data, sizeof(request.data.auth_crap.chal));