sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-12-07 20:23:50 +03:00
Code Activity

samba-tool: fixed ldapcmp to run as non-root

Browse Source 
this avoids the need for access to the secrets database 

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Pair-Programmed-With: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Andrew Tridgell
2011-07-12 10:41:52 +10:00
parent d9e2317f49
commit 6bc1957a54
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source4/scripting/python/samba/netcmd/ldapcmp.py
View File

@@ -874,15 +874,22 @@ class cmd_ldapcmp(Command):
context1=None, context2=None, context3=None, context1=None, context2=None, context3=None,
two=False, quiet=False, verbose=False, descriptor=False, sort_aces=False, view="section", two=False, quiet=False, verbose=False, descriptor=False, sort_aces=False, view="section",
base="", base2="", scope="SUB", credopts=None, sambaopts=None, versionopts=None): base="", base2="", scope="SUB", credopts=None, sambaopts=None, versionopts=None):
lp = sambaopts.get_loadparm() lp = sambaopts.get_loadparm()
creds = credopts.get_credentials(lp, fallback_machine=True)
using_ldap = URL1.startswith("ldap") or URL2.startswith("ldap")
if using_ldap:
creds = credopts.get_credentials(lp, fallback_machine=True)
else:
creds = None
creds2 = credopts.get_credentials2(lp, guess=False) creds2 = credopts.get_credentials2(lp, guess=False)
if creds2.is_anonymous(): if creds2.is_anonymous():
creds2 = creds creds2 = creds
else: else:
creds2.set_domain("") creds2.set_domain("")
creds2.set_workstation("") creds2.set_workstation("")
if not creds.authentication_requested(): if using_ldap and not creds.authentication_requested():
raise CommandError("You must supply at least one username/password pair") raise CommandError("You must supply at least one username/password pair")
# make a list of contexts to compare in # make a list of contexts to compare in