diff options
Diffstat (limited to 'ipa-admintools')
| -rw-r--r-- | ipa-admintools/ipa-adduser | 13 | ||||
| -rw-r--r-- | ipa-admintools/ipa-findgroup | 4 |
2 files changed, 15 insertions, 2 deletions
diff --git a/ipa-admintools/ipa-adduser b/ipa-admintools/ipa-adduser index 99aadee40..dd99e1e4d 100644 --- a/ipa-admintools/ipa-adduser +++ b/ipa-admintools/ipa-adduser @@ -43,6 +43,8 @@ def parse_options(): help="User's first name") parser.add_option("-l", "--lastname", dest="sn", help="User's last name") + parser.add_option("-p", "--password", dest="password", + help="Set user's password") parser.add_option("-s", "--shell", dest="shell", help="Set user's login shell to shell") parser.add_option("--usage", action="store_true", @@ -75,10 +77,11 @@ def main(): else: user.setValue('loginshell', "/bin/bash") + username = args[1] + try: client = ipaclient.IPAClient() client.add_user(user) - print args[1] + " successfully added" except xmlrpclib.Fault, f: print f.faultString return 1 @@ -92,6 +95,14 @@ def main(): print "%s" % (e.message) return 1 + if options.password is not None: + try: + client.modifyPassword(username, None, options.password) + except ipa.ipaerror.IPAError, e: + print "%s" % (e.message) + return 1 + + print username + " successfully added" return 0 main() diff --git a/ipa-admintools/ipa-findgroup b/ipa-admintools/ipa-findgroup index 43171e424..92b3b25b1 100644 --- a/ipa-admintools/ipa-findgroup +++ b/ipa-admintools/ipa-findgroup @@ -50,7 +50,9 @@ def main(): client = ipaclient.IPAClient() groups = client.find_groups(args[1]) - if len(groups) == 0: + counter = groups[0] + groups = groups[1:] + if counter == 0: print "No entries found for", args[1] return 0 |