[SCM] Samba Shared Repository - branch master updated

[Anatoliy Atanasov]

The branch, master has been updated
       via  f8275ba s4/ldapcmp: Check if creds2 is actualy set by the command line
      from  e1e8693 s3:build: don't use cli_ntsvcs.c any more.

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


- Log -----------------------------------------------------------------
commit f8275bae5d7b471967be7222170d049c18b8882f
Author: Anatoliy Atanasov <anatoliy.atanasov at postpath.com>
Date:   Tue Jan 4 17:45:16 2011 +0200

    s4/ldapcmp: Check if creds2 is actualy set by the command line
    
    When parsing the command line for the second set of credentials
    the parser returns wrong user if the second set of parameters isn't set.
    So check if the password is set instead.
    
    Autobuild-User: Anatoliy Atanasov <anatoliy.atanasov at postpath.com>
    Autobuild-Date: Tue Jan  4 18:11:26 CET 2011 on sn-devel-104

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

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


-- 
Samba Shared Repository