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
(This used to be commit cb27c197ee44d2be09014598e3928642b59ef956)

diff --git a/source3/auth/auth_winbind.c b/source3/auth/auth_winbind.c
index 4260a0e80b46a277dffb84aac6d3bb2693f96a84..78235d30fce9cbeec5722312d850dbd1aa6e2dfb 100644 (file)
--- a/source3/auth/auth_winbind.c
+++ b/source3/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));