[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  14d5983 s4:samba-tool: ldapcmp needs CredentialsOptionsDouble
      from  749868e s3:lib change default share security access mask

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


- Log -----------------------------------------------------------------
commit 14d5983d4d014f8a4b2ab3dc9c38ad94f041355f
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Jul 26 14:23:34 2011 +0200

    s4:samba-tool: ldapcmp needs CredentialsOptionsDouble
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Tue Jul 26 17:09:32 CEST 2011 on sn-devel-104

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

Summary of changes:
 source4/scripting/python/samba/netcmd/ldapcmp.py |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/python/samba/netcmd/ldapcmp.py b/source4/scripting/python/samba/netcmd/ldapcmp.py
index 44badce..0b02e04 100755
--- a/source4/scripting/python/samba/netcmd/ldapcmp.py
+++ b/source4/scripting/python/samba/netcmd/ldapcmp.py
@@ -842,6 +842,12 @@ class cmd_ldapcmp(Command):
     """compare two ldap databases"""
     synopsis = "ldapcmp URL1 URL2 <domain|configuration|schema> [options]"
 
+    takes_optiongroups = {
+        "sambaopts": options.SambaOptions,
+        "versionopts": options.VersionOptions,
+        "credopts": options.CredentialsOptionsDouble,
+    }
+
     takes_args = ["URL1", "URL2", "context1?", "context2?", "context3?"]
 
     takes_options = [


-- 
Samba Shared Repository