diff options
| author | Rob Crittenden <rcrit@ipa.greyoak.com> | 2008-08-06 13:00:36 -0400 |
|---|---|---|
| committer | Rob Crittenden <rcrit@ipa.greyoak.com> | 2008-08-07 11:21:33 -0400 |
| commit | 110f60da8e8cbf2b83f66b4959857dc62b407f06 (patch) | |
| tree | 17ad23d4b346d7e826f8e3755697c382ed5ac84e /ipa-admintools/ipa-moduser | |
| parent | fbc74a0cb48e7c596eb5c03fd56c068a8e0ef29e (diff) | |
| download | freeipa.git-110f60da8e8cbf2b83f66b4959857dc62b407f06.tar.gz freeipa.git-110f60da8e8cbf2b83f66b4959857dc62b407f06.tar.xz freeipa.git-110f60da8e8cbf2b83f66b4959857dc62b407f06.zip | |
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
Diffstat (limited to 'ipa-admintools/ipa-moduser')
| -rw-r--r-- | ipa-admintools/ipa-moduser | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ipa-admintools/ipa-moduser b/ipa-admintools/ipa-moduser index 4b3bd5c9..4ea40632 100644 --- a/ipa-admintools/ipa-moduser +++ b/ipa-admintools/ipa-moduser @@ -143,7 +143,7 @@ def main(): givenname = ipautil.user_input("First name", user.getValue('givenname'), allow_empty = False) else: givenname = options.gn - if (ipavalidate.String(givenname, notEmpty=True)): + if (not ipavalidate.String(givenname, notEmpty=True)): print "Please enter a value" return 1 @@ -151,7 +151,7 @@ def main(): lastname = ipautil.user_input("Last name", user.getValue('sn'), allow_empty = False) else: lastname = options.sn - if (ipavalidate.String(lastname, notEmpty=True)): + if (not ipavalidate.String(lastname, notEmpty=True)): print "Please enter a value" return 1 @@ -159,7 +159,7 @@ def main(): mail = ipautil.user_input_email("E-mail address", user.getValue('mail'), allow_empty = True) else: mail = options.mail - if (ipavalidate.Email(mail)): + if (not ipavalidate.Email(mail)): print "E-mail must include a user and domain name" return 1 |