diff options
| author | Karl MacMillan <kmacmillan@mentalrootkit.com> | 2007-08-01 16:21:13 -0400 |
|---|---|---|
| committer | Karl MacMillan <kmacmillan@mentalrootkit.com> | 2007-08-01 16:21:13 -0400 |
| commit | aed1f9110511e3669ab43c3894064c1371878876 (patch) | |
| tree | 1b2a30040f6fc9093021da53775bc6869d77eda2 /ipa-admintools | |
| parent | b1831b4593b3d219b79830f3012e7ff07f17b1d8 (diff) | |
| download | freeipa-aed1f9110511e3669ab43c3894064c1371878876.tar.gz freeipa-aed1f9110511e3669ab43c3894064c1371878876.tar.xz freeipa-aed1f9110511e3669ab43c3894064c1371878876.zip | |
Add local-dist target.
Remove hard-coded config.
Diffstat (limited to 'ipa-admintools')
| -rw-r--r-- | ipa-admintools/ipa-adduser | 11 | ||||
| -rw-r--r-- | ipa-admintools/ipa-finduser | 12 |
2 files changed, 15 insertions, 8 deletions
diff --git a/ipa-admintools/ipa-adduser b/ipa-admintools/ipa-adduser index b40fdee2c..5ce8d3ae7 100644 --- a/ipa-admintools/ipa-adduser +++ b/ipa-admintools/ipa-adduser @@ -22,6 +22,8 @@ import sys from optparse import OptionParser import ipa import ipa.rpcclient +import ipa.config + import xmlrpclib def usage(): @@ -43,7 +45,8 @@ def parse_options(): parser.add_option("--usage", action="store_true", help="Program usage") - (options, args) = parser.parse_args() + args = ipa.config.init_config(sys.argv) + options, args = parser.parse_args(args) if not options.gn or not options.sn: usage() @@ -52,14 +55,14 @@ def parse_options(): def main(): user={} - (options, args) = parse_options() + options, args = parse_options() - if len(args) != 1: + if len(args) != 2: usage() user['gn'] = options.gn user['sn'] = options.sn - user['uid'] = args[0] + user['uid'] = args[1] if options.gecos: user['gecos'] = options.gecos if options.directory: diff --git a/ipa-admintools/ipa-finduser b/ipa-admintools/ipa-finduser index 205b47ce9..0892791c4 100644 --- a/ipa-admintools/ipa-finduser +++ b/ipa-admintools/ipa-finduser @@ -18,9 +18,12 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # +import sys from optparse import OptionParser import ipa import ipa.rpcclient +import ipa.config + import base64 import sys import xmlrpclib @@ -32,19 +35,20 @@ def usage(): def parse_options(): parser = OptionParser() - (options, args) = parser.parse_args() + args = ipa.config.init_config(sys.argv) + options, args = parser.parse_args(args) return options, args def main(): user={} - (options, args) = parse_options() + options, args = parse_options() - if len(args) != 1: + if len(args) != 2: usage() try: - ent = ipa.rpcclient.get_user(args[0]) + ent = ipa.rpcclient.get_user(args[1]) for name, value in ent.items(): if isinstance(value, str): print name + ": " + value |