[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-281-g917905a

[Andrew Tridgell]

The branch, master has been updated
       via  917905aea0cfeff53009839f70cdc9eefdcfa2c9 (commit)
      from  c260bfa5d737d36e5701d00c55308dc1893b1e11 (commit)

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


- Log -----------------------------------------------------------------
commit 917905aea0cfeff53009839f70cdc9eefdcfa2c9
Author: Andrew Tridgell <tridge at samba.org>
Date:   Thu Mar 12 13:13:14 2009 +1100

    removed leading spaces from embedded ldif
    
    This fixes the problem with the setpassword command failing like this:
       Error: First line of ldif must be a dn not '    dn'

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

Summary of changes:
 source4/scripting/python/samba/samdb.py |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py
index 614970d..740806f 100644
--- a/source4/scripting/python/samba/samdb.py
+++ b/source4/scripting/python/samba/samdb.py
@@ -175,10 +175,10 @@ userAccountControl: %u
             user_dn = res[0].dn
 
             setpw = """
-    dn: %s
-    changetype: modify
-    replace: userPassword
-    userPassword: %s
+dn: %s
+changetype: modify
+replace: userPassword
+userPassword: %s
     """ % (user_dn, password)
 
             self.modify_ldif(setpw)
@@ -229,12 +229,12 @@ userAccountControl: %u
                 accountExpires = glue.unix2nttime(expiry_seconds + int(time.time()))
 
             mod = """
-    dn: %s
-    changetype: modify
-    replace: userAccountControl
-    userAccountControl: %u
-    replace: accountExpires
-    accountExpires: %u
+dn: %s
+changetype: modify
+replace: userAccountControl
+userAccountControl: %u
+replace: accountExpires
+accountExpires: %u
     """ % (res[0].dn, userAccountControl, accountExpires)
             # now change the database
             self.modify_ldif(mod)


-- 
Samba Shared Repository