diff options
Diffstat (limited to 'ipa-admintools')
| -rw-r--r-- | ipa-admintools/Makefile | 2 | ||||
| -rw-r--r-- | ipa-admintools/ipa-addservice (renamed from ipa-admintools/ipa-getkeytab) | 19 |
2 files changed, 4 insertions, 17 deletions
diff --git a/ipa-admintools/Makefile b/ipa-admintools/Makefile index 9586e71c..36d5d224 100644 --- a/ipa-admintools/Makefile +++ b/ipa-admintools/Makefile @@ -18,11 +18,11 @@ install: install -m 755 ipa-findgroup $(SBINDIR) install -m 755 ipa-groupmod $(SBINDIR) install -m 755 ipa-passwd $(SBINDIR) + install -m 755 ipa-addservice $(SBINDIR) install -m 755 ipa-adddelegation $(SBINDIR) install -m 755 ipa-deldelegation $(SBINDIR) install -m 755 ipa-listdelegation $(SBINDIR) install -m 755 ipa-moddelegation $(SBINDIR) - install -m 755 ipa-getkeytab $(SBINDIR) @for subdir in $(SUBDIRS); do \ (cd $$subdir && $(MAKE) $@) || exit 1; \ diff --git a/ipa-admintools/ipa-getkeytab b/ipa-admintools/ipa-addservice index 5ecb7e4a..fd94038f 100644 --- a/ipa-admintools/ipa-getkeytab +++ b/ipa-admintools/ipa-addservice @@ -36,13 +36,11 @@ import getpass import errno def usage(): - print "ipa-getkeytab [-a] principal filename" + print "ipa-addservice principal" sys.exit(1) def parse_options(): parser = OptionParser() - parser.add_option("-a", "--add", dest="add_princ", action="store_true", - help="add the principal") args = ipa.config.init_config(sys.argv) options, args = parser.parse_args(args) @@ -55,25 +53,14 @@ def main(): options, args = parse_options() - if len(args) != 3: + if len(args) != 2: usage() princ_name = args[1] - file_name = args[2] client = ipaclient.IPAClient() try: - if options.add_princ: - client.add_service_principal(princ_name) - - princs = client.get_keytab(princ_name) - - if princs is None: - print "could not generate keytab" - sys.exit(1) - - fd = open(file_name, "w") - fd.write(princs) + client.add_service_principal(princ_name) except Exception, e: print str(e) |