From 72595ab1a50926fec23597b31db0dce31de6e5ff Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Fri, 30 Nov 2007 12:04:16 -0500 Subject: [PATCH] delete_group() takes a DN, not a CN. Also do slightly better error reporting. --- ipa-admintools/ipa-delgroup | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/ipa-admintools/ipa-delgroup b/ipa-admintools/ipa-delgroup index b4f946065..ec911085d 100644 --- a/ipa-admintools/ipa-delgroup +++ b/ipa-admintools/ipa-delgroup @@ -50,7 +50,19 @@ def main(): try: client = ipaclient.IPAClient() - ret = client.delete_group(args[1]) + groups = client.find_groups(args[1], ['cn','description','gidnumber','nsAccountLock']) + + counter = groups[0] + groups = groups[1:] + + if counter == 0: + print "Group '%s' not found." % args[1] + return 2 + if counter != 1: + print "An exact group match was not found. Found %d groups" % counter + return 2 + + ret = client.delete_group(groups[0].dn) if (ret == "Success"): print args[1] + " successfully deleted" else: