[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha8-853-g915b789

[Matthias Dieter Wallnöfer]

The branch, master has been updated
       via  915b789c874e661dbd240e1fe3ba35f67746fdd0 (commit)
       via  1ce36ed74745632baca9a55a00ab748c21367632 (commit)
      from  54dffbea663ecf4542d6c5e30da6e346d5d60424 (commit)

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


- Log -----------------------------------------------------------------
commit 915b789c874e661dbd240e1fe3ba35f67746fdd0
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Thu Aug 6 11:38:06 2009 +0200

    s4: Simplify two lines in the "samdb.py" file (cosmetic)

commit 1ce36ed74745632baca9a55a00ab748c21367632
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Wed Aug 5 23:17:21 2009 +0200

    s4:enableaccount script: Remove a redundant line

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

Summary of changes:
 source4/scripting/python/samba/samdb.py |    3 +--
 source4/setup/enableaccount             |    1 -
 2 files changed, 1 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py
index 6cb2469..631f31c 100644
--- a/source4/scripting/python/samba/samdb.py
+++ b/source4/scripting/python/samba/samdb.py
@@ -81,8 +81,7 @@ description: %s
         """
         res = self.search(user_dn, ldb.SCOPE_BASE, None, ["userAccountControl"])
         assert len(res) == 1
-        userAccountControl = res[0]["userAccountControl"][0]
-        userAccountControl = int(userAccountControl)
+        userAccountControl = int(res[0]["userAccountControl"][0])
         if (userAccountControl & 0x2):
             userAccountControl = userAccountControl & ~0x2 # remove disabled bit
         if (userAccountControl & 0x20):
diff --git a/source4/setup/enableaccount b/source4/setup/enableaccount
index b270da0..1b73419 100755
--- a/source4/setup/enableaccount
+++ b/source4/setup/enableaccount
@@ -56,7 +56,6 @@ else:
 samdb = SamDB(url=url, session_info=system_session(), 
               credentials=creds, lp=lp)
 
-domain_dn = opts.base
 if opts.base is None:
 	res = samdb.search("", scope=ldb.SCOPE_BASE, 
 			  expression="(defaultNamingContext=*)", 


-- 
Samba Shared Repository