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

[Karolin Seeger]

The branch, v3-5-test has been updated
       via  4898de8 WHATSNEW: Start release notes for 3.5.14.
       via  33d3329 VERSION: Bump version up to 3.5.14.
       via  c119cd8 s3-winbindd Only use SamLogonEx when we can get unencrypted session keys
      from  81703ab v3-6-test: Further fix for bug 8338

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


- Log -----------------------------------------------------------------
commit 4898de8a5e2f715c4672c75fa44408e756724627
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Mar 20 21:27:17 2012 +0100

    WHATSNEW: Start release notes for 3.5.14.
    
    Karolin

commit 33d332960fa266a08ff0ee72945101051fa4d71e
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Mar 20 21:24:51 2012 +0100

    VERSION: Bump version up to 3.5.14.
    
    Karolin

commit c119cd8868fc7e2eb08b09f7092519007fd83bf6
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Thu Dec 15 09:57:56 2011 +1100

    s3-winbindd Only use SamLogonEx when we can get unencrypted session keys
    
    This ensures that we have some check on the session keys being returned
    as the RC4 cipher is not checksumed.
    
    The check comes from the fact that the credentials chain is tied to
    the netlgon session key, and so if the credentials check passes then
    the netlogon session key will be correct, and so the user session key
    will be correctly decrypted.
    
    Andrew Bartlett
    
    Signed-off-by: Matthieu Patou <mat at matws.net>
    
    s3: If we can't do validation 6 or sam_logon_ex use sam_logon only

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

Summary of changes:
 WHATSNEW.txt                    |   48 ++++++++++++++++++++++++++++++++++++--
 source3/VERSION                 |    2 +-
 source3/winbindd/winbindd_pam.c |    4 +-
 3 files changed, 48 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index d90d69c..391af0b 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,4 +1,46 @@
                    ==============================
+                   Release Notes for Samba 3.5.14
+			  , 2012
+                   ==============================
+
+
+This is the latest stable release of Samba 3.5.
+
+Major enhancements in Samba 3.5.14 include:
+
+o  
+
+Changes since 3.5.13:
+---------------------
+
+
+o   Jeremy Allison <jra at samba.org>
+
+
+######################################################################
+Reporting bugs & Development Discussion
+#######################################
+
+Please discuss this release on the samba-technical mailing list or by
+joining the #samba-technical IRC channel on irc.freenode.net.
+
+If you do report problems then please try to send high quality
+feedback. If you don't provide vital information to help us track down
+the problem then you will probably be ignored.  All bug reports should
+be filed under the Samba 3.5 product in the project's Bugzilla
+database (https://bugzilla.samba.org/).
+
+
+======================================================================
+== Our Code, Our Bugs, Our Responsibility.
+== The Samba Team
+======================================================================
+
+
+Release notes for older releases follow:
+----------------------------------------
+
+                   ==============================
                    Release Notes for Samba 3.5.13
 			  March 12, 2012
                    ==============================
@@ -69,7 +111,7 @@ o   Volker Lendecke <vl at samba.org>
       causing uninitialized memory read.
 
 
-o   Stefan Metzmacher <metze at samba.org
+o   Stefan Metzmacher <metze at samba.org>
     * BUG 5326: Fix cli_write_and_x() against OS/2 print shares.
     * BUG 8562: Fix double free error (talloc).
     * BUG 8593: Fix a crash bug in cldap_socket_recv_dgram().
@@ -121,8 +163,8 @@ database (https://bugzilla.samba.org/).
 ======================================================================
 
 
-Release notes for older releases follow:
-----------------------------------------
+----------------------------------------------------------------------
+
 
                    ==============================
                    Release Notes for Samba 3.5.12
diff --git a/source3/VERSION b/source3/VERSION
index c58d08c..700054e 100644
--- a/source3/VERSION
+++ b/source3/VERSION
@@ -25,7 +25,7 @@
 ########################################################
 SAMBA_VERSION_MAJOR=3
 SAMBA_VERSION_MINOR=5
-SAMBA_VERSION_RELEASE=13
+SAMBA_VERSION_RELEASE=14
 
 ########################################################
 # Bug fix releases use a letter for the patch revision #
diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index 26fdc5a..b0b8e40 100644
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -1365,7 +1365,7 @@ static NTSTATUS winbindd_dual_pam_auth_samlogon(struct winbindd_domain *domain,
 			domain->can_do_validation6 = false;
 		}
 
-		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;
 
@@ -1989,7 +1989,7 @@ enum winbindd_result winbindd_dual_pam_auth_crap(struct winbindd_domain *domain,
 			domain->can_do_validation6 = false;
 		}
 
-		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;
 


-- 
Samba Shared Repository