[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  f8056b7 s4:dsdb/password_hash: Honor password complexity settings.
       via  171c63c build: Install .po files for SWAT intl support
       via  631654a scripting: Handle missing LDAP entries in samba-tool domain classicupgrade
      from  bd18d99 Clean up client timeout definitions [rev. 2]

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit f8056b7a6998e002f473b0ad79eee046236a7032
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Nov 23 11:49:05 2012 +0100

    s4:dsdb/password_hash: Honor password complexity settings.
    
    Honor password complexity settings when creating new users.
    Without this patch, you could set simple passwords although the complexity
    settings were enabled. This was an issue with 'samba-tool user add' and also
    when adding new users via Windows' "Active Directory Users and Computers"
    MMC Snap-In.
    
    The following scenarios were tested successfully after applying the patch:
    -'samba-tool user add' against s4
    -'samba-tool user add -H' against a Windows DC
    -Adding a new user on a s4 DC using Windows' "Active Directory Users and
     Computers" MMC Snap-In.
    
    Please note that this bug was caused by a mistake in the documentation.
    
    Fix bug #9414 - 'samba-tool user add' ignores password complexity settings.
    
    Pair-programmed-with: Karolin Seeger <kseeger at samba.org>
    
    Signed-off-by: Stefan Metzmacher <metze at samba.org>
    Signed-off-by: Karolin Seeger <kseeger at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Thu Dec  6 05:11:43 CET 2012 on sn-devel-104

commit 171c63c3c45743f215ad360f928d9506951ddcd8
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Dec 5 12:52:22 2012 +1100

    build: Install .po files for SWAT intl support

commit 631654ae114ae909228a60de13286922d383f2bb
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Wed Dec 5 10:35:50 2012 +1100

    scripting: Handle missing LDAP entries in samba-tool domain classicupgrade
    
    Reported-by: Thomas Simmons <twsnnva at gmail.com>

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

Summary of changes:
 source3/wscript_build                          |    3 +++
 source4/dsdb/samdb/ldb_modules/password_hash.c |    8 +++++++-
 source4/scripting/python/samba/upgrade.py      |    6 ++++++
 3 files changed, 16 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/wscript_build b/source3/wscript_build
index 6fc0d06..107587d 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -1636,7 +1636,10 @@ bld.SAMBA3_PYTHON('pylibsmb',
 
 swat_dir = os.path.join(bld.curdir, '../swat')
 swat_files = recursive_dirlist(swat_dir, swat_dir, '*')
+swat_msg_dir = os.path.join(bld.curdir, 'po')
+swat_msg_files = recursive_dirlist(swat_msg_dir, swat_msg_dir, '*.msg')
 bld.INSTALL_FILES('${SWATDIR}', swat_files, base_name='../swat')
+bld.INSTALL_FILES('${CODEPAGEDIR}', swat_msg_files, base_name='po')
 
 ########################## INCLUDES #################################
 
diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c
index 620de75..0f8920c 100644
--- a/source4/dsdb/samdb/ldb_modules/password_hash.c
+++ b/source4/dsdb/samdb/ldb_modules/password_hash.c
@@ -2188,8 +2188,14 @@ static int setup_io(struct ph_context *ac,
 		& (UF_INTERDOMAIN_TRUST_ACCOUNT | UF_WORKSTATION_TRUST_ACCOUNT
 			| UF_SERVER_TRUST_ACCOUNT));
 
-	if ((io->u.userAccountControl & UF_PASSWD_NOTREQD) != 0) {
+	if (!ldb_req_is_untrusted(ac->req) &&
+	    (io->u.userAccountControl & UF_PASSWD_NOTREQD))
+	{
 		/* see [MS-ADTS] 2.2.15 */
+		/*
+		 * This seems to only happen for SAMR
+		 * and not for LDAP clients
+		 */
 		io->u.restrictions = 0;
 	}
 
diff --git a/source4/scripting/python/samba/upgrade.py b/source4/scripting/python/samba/upgrade.py
index 13d33c1..df9415e 100644
--- a/source4/scripting/python/samba/upgrade.py
+++ b/source4/scripting/python/samba/upgrade.py
@@ -802,6 +802,8 @@ Please fix this account before attempting to upgrade again
                     homes[username] = pwd.getpwnam(username).pw_dir
             except KeyError:
                 pass
+            except IndexError:
+                pass
 
             try:
                 if ldap:
@@ -810,6 +812,8 @@ Please fix this account before attempting to upgrade again
                     shells[username] = pwd.getpwnam(username).pw_shell
             except KeyError:
                 pass
+            except IndexError:
+                pass
 
             try:
                 if ldap:
@@ -818,6 +822,8 @@ Please fix this account before attempting to upgrade again
                     pgids[username] = pwd.getpwnam(username).pw_gid
             except KeyError:
                 pass
+            except IndexError:
+                pass
 
     logger.info("Reading WINS database")
     samba3_winsdb = None


-- 
Samba Shared Repository