summaryrefslogtreecommitdiffstats
path: root/ipa-admintools
diff options
context:
space:
mode:
authorrcritten@redhat.com <rcritten@redhat.com>2007-08-28 13:52:08 -0400
committerrcritten@redhat.com <rcritten@redhat.com>2007-08-28 13:52:08 -0400
commiteebaa73d3df425e309893d30f1f9dd6f43124439 (patch)
tree6573ea718a36cf5306fd36cc13059d3523038c27 /ipa-admintools
parent6eea6664e079d187c3b0420b4283af35205d3b03 (diff)
downloadfreeipa-eebaa73d3df425e309893d30f1f9dd6f43124439.tar.gz
freeipa-eebaa73d3df425e309893d30f1f9dd6f43124439.tar.xz
freeipa-eebaa73d3df425e309893d30f1f9dd6f43124439.zip
Implement delete users and groups
Implement adding a group to a group Some other small fixups Add new cmd-line tool ipa-delgroup
Diffstat (limited to 'ipa-admintools')
-rw-r--r--ipa-admintools/ipa-delgroup69
-rw-r--r--ipa-admintools/ipa-deluser2
-rw-r--r--ipa-admintools/ipa-groupmod3
3 files changed, 71 insertions, 3 deletions
diff --git a/ipa-admintools/ipa-delgroup b/ipa-admintools/ipa-delgroup
new file mode 100644
index 000000000..50967a49b
--- /dev/null
+++ b/ipa-admintools/ipa-delgroup
@@ -0,0 +1,69 @@
+#! /usr/bin/python -E
+# Authors: Rob Crittenden <rcritten@redhat.com>
+#
+# Copyright (C) 2007 Red Hat
+# see file 'COPYING' for use and warranty information
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; version 2 only
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+
+import sys
+from optparse import OptionParser
+import ipa
+import ipa.ipaclient as ipaclient
+import ipa.config
+
+import xmlrpclib
+import kerberos
+
+def usage():
+ print "ipa-delgroup group"
+ sys.exit(1)
+
+def parse_options():
+ parser = OptionParser()
+ parser.add_option("--usage", action="store_true",
+ help="Program usage")
+
+ args = ipa.config.init_config(sys.argv)
+ options, args = parser.parse_args(args)
+
+ return options, args
+
+def main():
+ options, args = parse_options()
+
+ if len(args) != 2:
+ usage()
+
+ try:
+ client = ipaclient.IPAClient()
+ ret = client.delete_group(args[1])
+ if (ret == "Success"):
+ print args[1] + " successfully deleted"
+ else:
+ print args[1] + " " + ret
+ except xmlrpclib.Fault, f:
+ print f.faultString
+ return 1
+ except kerberos.GSSError, e:
+ print "Could not initialize GSSAPI: %s/%s" % (e[0][0][0], e[0][1][0])
+ return 1
+ except xmlrpclib.ProtocolError, e:
+ print "Unable to connect to IPA server: %s" % (e.errmsg)
+ return 1
+
+ return 0
+
+main()
diff --git a/ipa-admintools/ipa-deluser b/ipa-admintools/ipa-deluser
index 10d248062..bcee2afd9 100644
--- a/ipa-admintools/ipa-deluser
+++ b/ipa-admintools/ipa-deluser
@@ -28,7 +28,7 @@ import xmlrpclib
import kerberos
def usage():
- print "ipa-adduser user"
+ print "ipa-deluser user"
sys.exit(1)
def parse_options():
diff --git a/ipa-admintools/ipa-groupmod b/ipa-admintools/ipa-groupmod
index eea96b43a..f3de92637 100644
--- a/ipa-admintools/ipa-groupmod
+++ b/ipa-admintools/ipa-groupmod
@@ -58,7 +58,6 @@ def main():
group=ipa.group.Group()
options, args = parse_options()
- print "len = ", len(args)
if (options.add or options.remove) and (len(args) != 3):
usage()
if (options.desc and (len(args) != 2)):
@@ -68,7 +67,7 @@ def main():
client = ipaclient.IPAClient()
if options.add:
client.add_user_to_group(args[1], args[2])
- print args[1] + " successfully added"
+ print args[1] + " successfully added to " + args[2]
elif options.remove:
client.remove_user_from_group(args[1], args[2])
print args[1] + " successfully removed"