Changeset 736 for branches/samba-3.5.x/source3/winbindd/winbindd_pam.c

Timestamp:

Nov 12, 2012, 5:38:52 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: update branche to 3.5.16

File:

• branches/samba-3.5.x/source3/winbindd/winbindd_pam.c (modified) (3 diffs)

branches/samba-3.5.x/source3/winbindd/winbindd_pam.c

@@ -1366 +1366 @@
                 }
 
-                logon_fn = contact_domain->can_do_samlogon_ex
+                logon_fn = (contact_domain->can_do_samlogon_ex && domain->can_do_validation6)
                         ? rpccli_netlogon_sam_network_logon_ex
                         : rpccli_netlogon_sam_network_logon;
@@ -1559 +1559 @@
 
         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 );
@@ -1990 +1992 @@
                 }
 
-                logon_fn = contact_domain->can_do_samlogon_ex
+                logon_fn = (contact_domain->can_do_samlogon_ex && domain->can_do_validation6)
                         ? rpccli_netlogon_sam_network_logon_ex
                         : rpccli_netlogon_sam_network_logon;