diff options
| author | Karl MacMillan <kmacmillan@mentalrootkit.com> | 2007-07-31 15:52:02 -0400 |
|---|---|---|
| committer | Karl MacMillan <kmacmillan@mentalrootkit.com> | 2007-07-31 15:52:02 -0400 |
| commit | 8cf45633fe3e2f114c418304bb949eefabc97485 (patch) | |
| tree | a747d278aea904723d59722fb40cb85544d91965 /ipa-admintools | |
| parent | 7d95cd612c1b340add692038c835e7cd8d8ad18b (diff) | |
| download | freeipa-8cf45633fe3e2f114c418304bb949eefabc97485.tar.gz freeipa-8cf45633fe3e2f114c418304bb949eefabc97485.tar.xz freeipa-8cf45633fe3e2f114c418304bb949eefabc97485.zip | |
Fixed broken patches and server spec.
Diffstat (limited to 'ipa-admintools')
| -rw-r--r-- | ipa-admintools/ipa-adduser | 7 | ||||
| -rw-r--r-- | ipa-admintools/ipa-finduser | 14 |
2 files changed, 12 insertions, 9 deletions
diff --git a/ipa-admintools/ipa-adduser b/ipa-admintools/ipa-adduser index 94a19dba..29946dd1 100644 --- a/ipa-admintools/ipa-adduser +++ b/ipa-admintools/ipa-adduser @@ -53,6 +53,7 @@ def parse_options(): def main(): user={} (options, args) = parse_options() + print args if len(args) != 1: usage() @@ -66,15 +67,15 @@ def main(): user['homedirectory'] = options.directory if options.shell: user['loginshell'] = options.shell - else + else: user['loginshell'] = "/bin/bash" try: ipa.rpcclient.add_user(user) - print args[0] "successfully added" + print args[0] + " successfully added" except xmlrpclib.Fault, f: print f.faultString return 0 -main()
\ No newline at end of file +main() diff --git a/ipa-admintools/ipa-finduser b/ipa-admintools/ipa-finduser index 928eff75..205b47ce 100644 --- a/ipa-admintools/ipa-finduser +++ b/ipa-admintools/ipa-finduser @@ -21,7 +21,6 @@ from optparse import OptionParser import ipa import ipa.rpcclient -import ipa.ipaldap import base64 import sys import xmlrpclib @@ -46,13 +45,16 @@ def main(): try: ent = ipa.rpcclient.get_user(args[0]) - entry = ipa.ipaldap.Entry(ent['dn']) - for e in ent: - entry.setValues(e, ent[e]) - print entry + for name, value in ent.items(): + if isinstance(value, str): + print name + ": " + value + else: + print name + ": " + for x in value: + print "\t" + x except xmlrpclib.Fault, fault: print fault.faultString return 0 -main()
\ No newline at end of file +main() |