[SCM] Samba Shared Repository - branch master updated

Amitay Isaacs amitay at samba.org
Mon Nov 14 18:52:01 MST 2011


The branch, master has been updated
       via  2611003 samba-tool: Don't set UF_PASSWD_NOTREQD flag on "user disable"
       via  f057cb4 samba-tool: Remove "domain machinepassword" command
      from  d48f08f s4-smbtorture: add spoolss_OpenPrinterEx ndr test with full devmode.

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


- Log -----------------------------------------------------------------
commit 2611003258255424bc4636b60f5e8a27b02d8a55
Author: Giampaolo Lauria <lauria2 at yahoo.com>
Date:   Mon Nov 14 17:54:29 2011 -0500

    samba-tool: Don't set UF_PASSWD_NOTREQD flag on "user disable"
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>
    
    Autobuild-User: Amitay Isaacs <amitay at samba.org>
    Autobuild-Date: Tue Nov 15 02:51:16 CET 2011 on sn-devel-104

commit f057cb4f84f0aafd8c1ecc046b8c92f2fb812f87
Author: Giampaolo Lauria <lauria2 at yahoo.com>
Date:   Fri Nov 11 10:37:39 2011 -0500

    samba-tool: Remove "domain machinepassword" command
    
    As per Andrew Bartlett's comment:
    "we should remove it.  This was originally a script to support some
    interactions between samba3 and samba4, when they were in distinct build
    systems.  We now can call between the two systems without difficulty at
    runtime, so this command has no value."
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>

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

Summary of changes:
 source4/scripting/python/samba/netcmd/domain.py |   28 -----------------------
 source4/scripting/python/samba/samdb.py         |    2 +-
 2 files changed, 1 insertions(+), 29 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/python/samba/netcmd/domain.py b/source4/scripting/python/samba/netcmd/domain.py
index 35e9d29..f1ebf7e 100644
--- a/source4/scripting/python/samba/netcmd/domain.py
+++ b/source4/scripting/python/samba/netcmd/domain.py
@@ -336,33 +336,6 @@ class cmd_domain_level(Command):
 
 
 
-class cmd_domain_machinepassword(Command):
-    """Gets a machine password out of our SAM"""
-
-    synopsis = "%prog <accountname> [options]"
-
-    takes_args = ["accountname"]
-
-    def run(self, accountname, sambaopts=None, credopts=None, versionopts=None):
-        lp = sambaopts.get_loadparm()
-        creds = credopts.get_credentials(lp, fallback_machine=True)
-        url = lp.private_path("secrets.ldb")
-        if not os.path.exists(url):
-            raise CommandError("secrets database not found at %s " % url)
-        if not accountname.endswith('$'):
-            accountname += '$'
-        secretsdb = Ldb(url=url, session_info=system_session(),
-            credentials=creds, lp=lp)
-        result = secretsdb.search(attrs=["secret"],
-            expression="(&(objectclass=primaryDomain)(samaccountname=%s))" % ldb.binary_encode(accountname))
-
-        if len(result) != 1:
-            raise CommandError("search returned %d records, expected 1" % len(result))
-
-        self.outf.write("%s\n" % result[0]["secret"])
-
-
-
 class cmd_domain_passwordsettings(Command):
     """Sets password settings
 
@@ -640,6 +613,5 @@ class cmd_domain(SuperCommand):
     subcommands["exportkeytab"] = cmd_domain_export_keytab()
     subcommands["join"] = cmd_domain_join()
     subcommands["level"] = cmd_domain_level()
-    subcommands["machinepassword"] = cmd_domain_machinepassword()
     subcommands["passwordsettings"] = cmd_domain_passwordsettings()
     subcommands["samba3upgrade"] = cmd_domain_samba3upgrade()
diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py
index a21ed76..234a9b9 100644
--- a/source4/scripting/python/samba/samdb.py
+++ b/source4/scripting/python/samba/samdb.py
@@ -87,7 +87,7 @@ class SamDB(samba.Ldb):
             samccountname=name)
         """
 
-        flags = samba.dsdb.UF_ACCOUNTDISABLE | samba.dsdb.UF_PASSWD_NOTREQD
+        flags = samba.dsdb.UF_ACCOUNTDISABLE
         self.toggle_userAccountFlags(search_filter, flags, on=True)
 
     def enable_account(self, search_filter):


-- 
Samba Shared Repository


More information about the samba-cvs mailing list