Change user and group validators to match shadow-utils

This sets the regex to [a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,30}[a-zA-Z0-9_.$-]?

Also change the validators to return True/False

450613, 457124

1 files changed, 7 insertions, 4 deletions

diff --git a/ipa-admintools/ipa-addgroup b/ipa-admintools/ipa-addgroup
index cc813836c..d99d588b8 100644
--- a/ipa-admintools/ipa-addgroup
+++ b/ipa-admintools/ipa-addgroup
@@ -27,6 +27,7 @@ try:
     import ipa.ipautil as ipautil
     import ipa.config
     import ipa.ipaerror
+    import ipa.ipaadminutil as ipaadminutil
 
     import xmlrpclib
     import kerberos
@@ -82,18 +83,20 @@ def main():
         usage()
 
     if (len(args) != 2):
-        cn = ipautil.user_input("Group name", allow_empty = False)
+        cn = ipautil.user_input_name("Group name")
     else:
         cn = args[1]
-        if (ipavalidate.String(cn, notEmpty=True)):
-            print "Please enter a value"
+        try:
+            ipaadminutil.check_name(cn)
+        except ValueError, e:
+            print "Group name " + str(e)
             return 1
 
     if not options.desc:
         desc = ipautil.user_input("Description", allow_empty = False)
     else:
         desc = options.desc
-        if (ipavalidate.String(desc, notEmpty=True)):
+        if (not ipavalidate.String(desc, notEmpty=True)):
             print "Please enter a value"
             return 1