Default to recursive mode.

Switch flag to -R to disable recursive (if you want to see subgroups)

Examples:
```
ldapuserdir-ctl -n -v -R org-4800

ldapuserdir-ctl -n -R -g bliven_s
```
This commit is contained in:
Spencer Bliven
2019-01-31 14:21:35 +01:00
parent 0ffd91aa96
commit 6e405c71d8
2 changed files with 8 additions and 7 deletions

View File

@@ -227,11 +227,11 @@ parser.add_option('-V',
default = False
)
parser.add_option('-r',
action = 'store_true',
parser.add_option('-R',
action = 'store_false',
dest = 'recursive',
help = 'Recursively resolve groups',
default = False
help = "Don't recursively resolve groups",
default = True
)
(options, args) = parser.parse_args()
@@ -367,7 +367,8 @@ try:
sys.stdout.write("\n".join(ldapdir.get_groups_for_user(user_to_group,
gfilter=sfilter,
mssfu=flag_mssfu,
returndn=flag_showdn))
returndn=flag_showdn,
recursive=options.recursive))
+ '\n')
#sys.stdout.write("\n".join(ldapdir.get_groups_for_user(user_to_group))
# + "\n")

View File

@@ -481,7 +481,7 @@ class LdapUserDir(object):
return grplist
def get_groups_for_user(self, user, gfilter=None, returndn=False,
mssfu=False):
mssfu=False, recursive=True):
"""Get groups for a particular user from LDAP.
The function will try to determine whether it receives a DN or
@@ -512,7 +512,7 @@ class LdapUserDir(object):
else:
dnname = user
reslist = self.get_memberof(dnname, recursive=True, mssfu=mssfu)
reslist = self.get_memberof(dnname, recursive=recursive, mssfu=mssfu)
if not returndn:
try: