diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-07-19 11:03:44 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-07-21 11:44:31 +1000 |
| commit | 7d399376b89b13417f7b1382259478bf82ae91c3 (patch) | |
| tree | 2a804d3142fdc9fc6b2b59a7dd56ecfde67a16bc | |
| parent | 6e7b8aaf1d7b64df07fe2cbc731addd59be8e2d8 (diff) | |
| download | samba-7d399376b89b13417f7b1382259478bf82ae91c3.tar.gz samba-7d399376b89b13417f7b1382259478bf82ae91c3.tar.bz2 samba-7d399376b89b13417f7b1382259478bf82ae91c3.zip | |
samba-tool: use 'exportkeytab' instead of 'dumpkeys'
a 'keytab' is a particular format known to administrators, whereas
'keys' is a bit too vague
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | source4/scripting/python/samba/netcmd/domain.py | 6 | ||||
| -rwxr-xr-x | testprogs/blackbox/test_export_keytab.sh | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source4/scripting/python/samba/netcmd/domain.py b/source4/scripting/python/samba/netcmd/domain.py index 110a865373..9085d8b56e 100644 --- a/source4/scripting/python/samba/netcmd/domain.py +++ b/source4/scripting/python/samba/netcmd/domain.py @@ -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() diff --git a/testprogs/blackbox/test_export_keytab.sh b/testprogs/blackbox/test_export_keytab.sh index 5cb4317d81..fc25a9f807 100755 --- a/testprogs/blackbox/test_export_keytab.sh +++ b/testprogs/blackbox/test_export_keytab.sh @@ -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 |