Add option to list common attributes for use with --setattr,--addattr,--delattr

4 files changed, 37 insertions, 4 deletions

diff --git a/ipa-admintools/ipa-adddelegation b/ipa-admintools/ipa-adddelegation
index 5ecd70ada..750f7573c 100644
--- a/ipa-admintools/ipa-adddelegation
+++ b/ipa-admintools/ipa-adddelegation
@@ -34,7 +34,8 @@ import ldap
 import errno
 
 def usage():
-    print "ipa-adddelgation [-a|--attributes attr1,attr2,..,attrn] [-l|--list] [-s|--source STRING] [-t|--target STRING] name"
+    print "ipa-adddelegation [-l|--list]"
+    print "ipa-adddelegation [-a|--attributes attr1,attr2,..,attrn] [-s|--source STRING] [-t|--target STRING] name"
     sys.exit(1)
 
 def parse_options():
diff --git a/ipa-admintools/ipa-moddelegation b/ipa-admintools/ipa-moddelegation
index 24bd640b6..74cfcc482 100644
--- a/ipa-admintools/ipa-moddelegation
+++ b/ipa-admintools/ipa-moddelegation
@@ -37,13 +37,16 @@ import errno
 aci_fields = ['*', 'aci']
 
 def usage():
-    print "ipa-moddelgation [-a|--attributes attr1,attr2,..,attrn] [-s|--source STRING] [-t|--target STRING] name"
+    print "ipa-moddelegation [-l|--list]"
+    print "ipa-moddelegation [-a|--attributes attr1,attr2,..,attrn] [-s|--source STRING] [-t|--target STRING] name"
     sys.exit(1)
 
 def parse_options():
     parser = OptionParser()
     parser.add_option("-a", "--attributes", dest="attributes",
                       help="The attributes the source group may change in the target group")
+    parser.add_option("-l", "--list", dest="list", action="store_true",
+                      help="List common attributes (this is not an exhaustive list)")
     parser.add_option("-s", "--source", dest="source",
                       help="The source group name")
     parser.add_option("-t", "--target", dest="target",
@@ -60,11 +63,18 @@ def main():
 
     options, args = parse_options()
 
+    if options.list:
+        client = ipaclient.IPAClient()
+        list = client.get_all_attrs()
+
+        for x in list:
+            print x
+        return 0
+
     if options.usage or len(args) != 2:
         usage()
 
     if not options.attributes and not options.source and not options.target:
-        print "Missing something"
         usage()
 
     try:
diff --git a/ipa-admintools/ipa-modgroup b/ipa-admintools/ipa-modgroup
index 4e17db59c..b75672f32 100644
--- a/ipa-admintools/ipa-modgroup
+++ b/ipa-admintools/ipa-modgroup
@@ -32,6 +32,7 @@ import ldap
 import errno
 
 def usage():
+    print "ipa-modgroup [-l|--list]"
     print "ipa-modgroup [-a|--add] [-r|--remove] user group"
     print "ipa-modgroup [-d|--desc description STRING] [--addattr attribute=value] [--delattr attribute] [--setattr attribute=value] group"
     sys.exit(1)
@@ -55,6 +56,8 @@ def parse_options():
     parser.add_option("--setattr", dest="setattr",
                       help="Set an attribute, dropping any existing values that may exist",
                       action="append")
+    parser.add_option("-l", "--list", dest="list", action="store_true",
+                      help="List common attributes (this is not an exhaustive list)")
     parser.add_option("--usage", action="store_true",
                       help="Program usage")
 
@@ -62,7 +65,7 @@ def parse_options():
     options, args = parser.parse_args(args)
 
     if (not options.add and not options.remove) and (not options.desc and
-        not options.addattr and not options.delattr and not options.setattr):
+        not options.addattr and not options.delattr and not options.setattr and not options.list):
         usage()
 
     return options, args
@@ -89,6 +92,14 @@ def main():
     group=ipa.group.Group()
     options, args = parse_options()
 
+    if options.list:
+        client = ipaclient.IPAClient()
+        list = client.get_all_attrs()
+
+        for x in list:
+            print x
+        return 0
+
     if options.usage:
         usage()
     if (options.add or options.remove) and (len(args) != 3):
diff --git a/ipa-admintools/ipa-moduser b/ipa-admintools/ipa-moduser
index 6b19ff50f..dd909c90a 100644
--- a/ipa-admintools/ipa-moduser
+++ b/ipa-admintools/ipa-moduser
@@ -32,6 +32,7 @@ import ldap
 import errno
 
 def usage():
+    print "ipa-moduser [--list]"
     print "ipa-moduser [-a|--activate] [-c|--gecos STRING] [-d|--directory STRING] [-f|--firstname STRING] [-l|--lastname STRING] [-s|--shell STRING] [--addattr attribute=value] [--delattr attribute] [--setattr attribute=value] user"
     sys.exit(1)
 
@@ -60,6 +61,8 @@ def parse_options():
     parser.add_option("--setattr", dest="setattr",
                       help="Set an attribute, dropping any existing values that may exist",
                       action="append")
+    parser.add_option("--list", dest="list", action="store_true",
+                      help="List common attributes (this is not an exhaustive list)")
     parser.add_option("-M", "--mailAddress", dest="mail",
                       help="Set user's e-mail address")
     parser.add_option("--usage", action="store_true",
@@ -86,6 +89,14 @@ def main():
 
     options, args = parse_options()
 
+    if options.list:
+        client = ipaclient.IPAClient()
+        list = client.get_all_attrs()
+
+        for x in list:
+            print x
+        return 0
+
     if options.usage or len(args) != 2:
         usage()