[SCM] Samba Shared Repository - branch v3-6-test updated

[Jeremy Allison]

The branch, v3-6-test has been updated
       via  0eeee19... We should be using the winbindd separator in this case, not hardcoding a \\ value.
      from  dbaa892... s3: Do the ftruncate write cache optimization in one place

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit 0eeee199500ece1e23514e22bb65350bd92bd6cf
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Jul 29 13:47:27 2010 -0700

    We should be using the winbindd separator in this case, not hardcoding
    a \\ value.
    
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source3/winbindd/winbindd_pam.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index bf113e8..010245f 100644
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -1469,7 +1469,9 @@ enum winbindd_result winbindd_dual_pam_auth(struct winbindd_domain *domain,
 	parse_domain_user(mapped_user, name_domain, name_user);
 
 	if ( mapped_user != state->request->data.auth.user ) {
-		fstr_sprintf( domain_user, "%s\\%s", name_domain, name_user );
+		fstr_sprintf( domain_user, "%s%c%s", name_domain,
+			*lp_winbind_separator(),
+			name_user );
 		safe_strcpy( state->request->data.auth.user, domain_user,
 			     sizeof(state->request->data.auth.user)-1 );
 	}


-- 
Samba Shared Repository