[SCM] Samba Shared Repository - branch master updated

[Anatoliy Atanasov]

The branch, master has been updated
       via  2e30897 Revert "s4/ldapcmp: Fix the parsing of the second set of credentials"
       via  3f0db2e Revert "s4/ldapcmp: Check if creds2 is actualy set by the command line"
      from  0185f66 script/autobuild.py: add pidl tests

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


- Log -----------------------------------------------------------------
commit 2e308975037560a7493620d9bd7dd604cff4e2a8
Author: Anatoliy Atanasov <anatoliy.atanasov at postpath.com>
Date:   Wed Jan 5 15:32:42 2011 +0200

    Revert "s4/ldapcmp: Fix the parsing of the second set of credentials"
    
    This reverts commit 1cbce84683ef4fa49b85d87988c5e8db7057530a.
    Wrong assumption about a segmentation fault

commit 3f0db2e53bf0f30bf1e10b19d1493f3f94ec7433
Author: Anatoliy Atanasov <anatoliy.atanasov at postpath.com>
Date:   Wed Jan 5 15:32:06 2011 +0200

    Revert "s4/ldapcmp: Check if creds2 is actualy set by the command line"
    
    This reverts commit f8275bae5d7b471967be7222170d049c18b8882f.
    Wrong assumption about a segmentation fault.

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

Summary of changes:
 source4/scripting/python/samba/netcmd/ldapcmp.py |    4 ++--
 1 files changed, 2 insertions(+), 2 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 76f7d95..1318457 100755
--- a/source4/scripting/python/samba/netcmd/ldapcmp.py
+++ b/source4/scripting/python/samba/netcmd/ldapcmp.py
@@ -771,8 +771,8 @@ class cmd_ldapcmp(Command):
             credopts=None, sambaopts=None, versionopts=None):
         lp = sambaopts.get_loadparm()
         creds = credopts.get_credentials(lp, fallback_machine=True)
-        creds2 = credopts.get_credentials2(lp)
-        if credopts.no_pass2:
+        creds2 = credopts.get_credentials2(lp, False)
+        if creds2.is_anonymous():
             creds2 = creds
         if not creds.authentication_requested():
             raise CommandError("You must supply at least one username/password pair")


-- 
Samba Shared Repository