sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

samba-tool: use 'exportkeytab' instead of 'dumpkeys'

Browse Source 
a 'keytab' is a particular format known to administrators, whereas
'keys' is a bit too vague

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Andrew Tridgell 2011-07-19 11:03:44 +10:00
parent 6e7b8aaf1d
commit 7d399376b8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source4/scripting/python/samba/netcmd/domain.py
View File

@ -50,9 +50,9 @@ from samba.dsdb import (
class cmd_domain_dumpkeys(Command):
class cmd_domain_export_keytab(Command):
"""Dumps kerberos keys of the domain into a keytab"""
synopsis = "%prog domain dumpkeys <keytab>"
synopsis = "%prog domain exportkeytab <keytab>"
takes_options = [
]
@ -491,7 +491,7 @@ class cmd_domain(SuperCommand):
"""Domain management"""
subcommands = {}
subcommands["dumpkeys"] = cmd_domain_dumpkeys()
subcommands["exportkeytab"] = cmd_domain_export_keytab()
subcommands["join"] = cmd_domain_join()
subcommands["level"] = cmd_domain_level()
subcommands["machinepassword"] = cmd_domain_machinepassword()

4
testprogs/blackbox/test_export_keytab.sh
View File

@ -46,8 +46,8 @@ USERPASS=testPaSS@01%
testit "create user locally" $VALGRIND $newuser nettestuser $USERPASS $@ || failed=`expr $failed + 1`
testit "dump keys from domain" $VALGRIND $samba_tool domain dumpkeys keytab $PREFIX/tmpkeytab $@ || failed=`expr $failed + 1`
testit "dump keys from domain (2nd time)" $VALGRIND $samba_tool domain dumpkeys keytab $PREFIX/tmpkeytab $@ || failed=`expr $failed + 1`
testit "dump keytab from domain" $VALGRIND $samba_tool domain exportkeytab $PREFIX/tmpkeytab $@ || failed=`expr $failed + 1`
testit "dump keytab from domain (2nd time)" $VALGRIND $samba_tool domain exportkeytab $PREFIX/tmpkeytab $@ || failed=`expr $failed + 1`
KRB5CCNAME="$PREFIX/tmpuserccache"
export KRB5CCNAME