diff options
| author | Tom Yu <tlyu@mit.edu> | 2005-02-12 00:27:35 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2005-02-12 00:27:35 +0000 |
| commit | 720a2f9e436b96ed05d09682cc4fd0c0bebfedab (patch) | |
| tree | 1de501669f3d59a64f49f0cd8b5b2e65af04d49a /src | |
| parent | dc8ef9e5841cd737a3eb39af0556ccab86473006 (diff) | |
| download | krb5-720a2f9e436b96ed05d09682cc4fd0c0bebfedab.tar.gz krb5-720a2f9e436b96ed05d09682cc4fd0c0bebfedab.tar.xz krb5-720a2f9e436b96ed05d09682cc4fd0c0bebfedab.zip | |
* kadmin.c (kadmin_startup): New flag "-N" to prevent fallback to
AUTH_GSSAPI.
* kadmin.M: Describe "-O" and "-N" flags.
ticket: 2913
tags: pullup
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17101 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src')
| -rw-r--r-- | src/kadmin/cli/ChangeLog | 7 | ||||
| -rw-r--r-- | src/kadmin/cli/kadmin.M | 8 | ||||
| -rw-r--r-- | src/kadmin/cli/kadmin.c | 5 |
3 files changed, 18 insertions, 2 deletions
diff --git a/src/kadmin/cli/ChangeLog b/src/kadmin/cli/ChangeLog index 1fe06ba3e5..1e2ef44f03 100644 --- a/src/kadmin/cli/ChangeLog +++ b/src/kadmin/cli/ChangeLog @@ -1,3 +1,10 @@ +2005-02-11 Tom Yu <tlyu@mit.edu> + + * kadmin.c (kadmin_startup): New flag "-N" to prevent fallback to + AUTH_GSSAPI. + + * kadmin.M: Describe "-O" and "-N" flags. + 2004-09-17 Tom Yu <tlyu@mit.edu> * Makefile.in (install): Use $(INSTALL_SCRIPT) for scripts. diff --git a/src/kadmin/cli/kadmin.M b/src/kadmin/cli/kadmin.M index a35106c714..d9d6abda10 100644 --- a/src/kadmin/cli/kadmin.M +++ b/src/kadmin/cli/kadmin.M @@ -5,6 +5,7 @@ kadmin \- Kerberos V5 database administration program .TP .B kadmin .ad l +[\fB\-O\fP | \fB\-N\fP] [\fB\-r\fP \fIrealm\fP] [\fB\-p\fP \fIprincipal\fP] [\fB\-q\fP \fIquery\fP] .br [[\fB-c\fP \fIcache_name\fP] | [\fB-k\fP [\fB-t\fP @@ -140,7 +141,12 @@ to prompt for the master database password. \fB\-e\fP \fIenc:salt_list\fP Sets the list of encryption types and salt types to be used for any new keys created. - +.TP +.B \-O +Force use of old AUTH_GSSAPI authentication flavor. +.TP +.B \-N +Prevent fallback to AUTH_GSSAPI authentication flavor. .SH DATE FORMAT Various commands in kadmin can take a variety of date formats, specifying durations or absolute times. Examples of valid formats are: diff --git a/src/kadmin/cli/kadmin.c b/src/kadmin/cli/kadmin.c index 9b9294df75..957659dad7 100644 --- a/src/kadmin/cli/kadmin.c +++ b/src/kadmin/cli/kadmin.c @@ -193,7 +193,7 @@ char *kadmin_startup(argc, argv) exit(1); } - while ((optchar = getopt(argc, argv, "r:p:kq:w:d:s:mc:t:e:O")) != EOF) { + while ((optchar = getopt(argc, argv, "r:p:kq:w:d:s:mc:t:e:ON")) != EOF) { switch (optchar) { case 'r': def_realm = optarg; @@ -244,6 +244,9 @@ char *kadmin_startup(argc, argv) case 'O': params.mask |= KADM5_CONFIG_OLD_AUTH_GSSAPI; break; + case 'N': + params.mask |= KADM5_CONFIG_AUTH_NOFALLBACK; + break; default: usage(); } |