mirror of
https://github.com/samba-team/samba.git
synced 2025-01-08 21:18:16 +03:00
bug 12293: stop group.py throwing errors if group is unknown
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12293 Signed-off-by: Rowland Penny <rpenny@samba.org> Reviewed-by: Alexander Bokovoy <ab@samba.org> Autobuild-User(master): Alexander Bokovoy <ab@samba.org> Autobuild-Date(master): Fri Sep 30 05:53:17 CEST 2016 on sn-devel-144
This commit is contained in:
parent
22da0887b2
commit
780a80c28d
@ -169,11 +169,23 @@ Example2 deletes group Group2 from the local server. The command is run under r
|
||||
|
||||
lp = sambaopts.get_loadparm()
|
||||
creds = credopts.get_credentials(lp, fallback_machine=True)
|
||||
samdb = SamDB(url=H, session_info=system_session(),
|
||||
credentials=creds, lp=lp)
|
||||
|
||||
filter = ("(&(sAMAccountName=%s)(objectClass=group))" %
|
||||
groupname)
|
||||
|
||||
try:
|
||||
samdb = SamDB(url=H, session_info=system_session(),
|
||||
credentials=creds, lp=lp)
|
||||
samdb.deletegroup(groupname)
|
||||
res = samdb.search(base=samdb.domain_dn(),
|
||||
scope=ldb.SCOPE_SUBTREE,
|
||||
expression=filter,
|
||||
attrs=["dn"])
|
||||
group_dn = res[0].dn
|
||||
except IndexError:
|
||||
raise CommandError('Unable to find group "%s"' % (groupname))
|
||||
|
||||
try:
|
||||
samdb.delete(group_dn)
|
||||
except Exception, e:
|
||||
# FIXME: catch more specific exception
|
||||
raise CommandError('Failed to remove group "%s"' % groupname, e)
|
||||
|
Loading…
Reference in New Issue
Block a user