diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-01-28 16:39:03 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-01-28 16:39:03 +1100 |
| commit | c16cd19bda30e6dc7be0540c4c70cbcaf3c7fe67 (patch) | |
| tree | 8efaf6b885543a006a91294923324fc580d01bbf /source4/lib/ldb/tests/python/ldap.py | |
| parent | 11061499e182b9c41ec793d4eefb8a2cf7c88bfe (diff) | |
| parent | cab677a33f0376cd1bf96ec561dc0463bbf80edd (diff) | |
| download | samba-c16cd19bda30e6dc7be0540c4c70cbcaf3c7fe67.tar.gz samba-c16cd19bda30e6dc7be0540c4c70cbcaf3c7fe67.tar.bz2 samba-c16cd19bda30e6dc7be0540c4c70cbcaf3c7fe67.zip | |
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-abartlet
(This used to be commit f0a4db22e58d393be5b28f767ee6d0abfc8f11dc)
Diffstat (limited to 'source4/lib/ldb/tests/python/ldap.py')
| -rwxr-xr-x | source4/lib/ldb/tests/python/ldap.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source4/lib/ldb/tests/python/ldap.py b/source4/lib/ldb/tests/python/ldap.py index 01b66a3890..d35f7767df 100755 --- a/source4/lib/ldb/tests/python/ldap.py +++ b/source4/lib/ldb/tests/python/ldap.py @@ -19,7 +19,8 @@ from samba import Ldb import param parser = optparse.OptionParser("ldap [options] <host>") -parser.add_option_group(options.SambaOptions(parser)) +sambaopts = options.SambaOptions(parser) +parser.add_option_group(sambaopts) parser.add_option_group(options.VersionOptions(parser)) # use command line creds if available credopts = options.CredentialsOptions(parser) @@ -33,9 +34,7 @@ if len(args) < 1: host = args[0] -lp = param.LoadParm() -if opts.configfile: - lp.load(opts.configfile) +lp = sambaopts.get_loadparm() def delete_force(ldb, dn): try: |