diff options
| author | Tom Yu <tlyu@mit.edu> | 2004-06-16 03:11:54 +0000 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2004-06-16 03:11:54 +0000 |
| commit | 02c51b4f59b6c86c2112cd10a209322ad1cbb0c6 (patch) | |
| tree | 708bc38a3e15681fd669df856517dcd52e0d5d47 /src/kadmin/cli | |
| parent | 2584d8a1f09cc0bf93708474c11a3012bedac42b (diff) | |
| download | krb5-02c51b4f59b6c86c2112cd10a209322ad1cbb0c6.tar.gz krb5-02c51b4f59b6c86c2112cd10a209322ad1cbb0c6.tar.xz krb5-02c51b4f59b6c86c2112cd10a209322ad1cbb0c6.zip | |
This commit merges the RPCSEC_GSS integration branch onto the trunk.
Remaining work includes:
* Default to using kadmin/fqdn for SEAM compatibility
* Namespace cleanups and other API tweaks -- this API is not stable yet
* Fix lib/rpc/unit-test testsuite to test RPCSEC_GSS in addition to
AUTH_GSSAPI
Additional work will be tracked in separate tickets. This merge is
bracketed between the tags "tlyu-umich-rpc-merge-pre" and
"tlyu-umich-rpc-merge-post".
ticket: 2578
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16467 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin/cli')
| -rw-r--r-- | src/kadmin/cli/ChangeLog | 5 | ||||
| -rw-r--r-- | src/kadmin/cli/kadmin.c | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/kadmin/cli/ChangeLog b/src/kadmin/cli/ChangeLog index 8de05c350..4bfa42652 100644 --- a/src/kadmin/cli/ChangeLog +++ b/src/kadmin/cli/ChangeLog @@ -1,3 +1,8 @@ +2004-06-15 Tom Yu <tlyu@mit.edu> + + * kadmin.c (kadmin_startup): Add option to force old AUTH_GSSAPI + flavor. + 2004-05-31 Ezra Peisach <epeisach@mit.edu> * kadmin.h, keytab.c: Remove inclusion of k5-int.h. diff --git a/src/kadmin/cli/kadmin.c b/src/kadmin/cli/kadmin.c index 7ca0898d8..3eef8529b 100644 --- a/src/kadmin/cli/kadmin.c +++ b/src/kadmin/cli/kadmin.c @@ -192,7 +192,7 @@ char *kadmin_startup(argc, argv) exit(1); } - while ((optchar = getopt(argc, argv, "r:p:kq:w:d:s:mc:t:e:")) != EOF) { + while ((optchar = getopt(argc, argv, "r:p:kq:w:d:s:mc:t:e:O")) != EOF) { switch (optchar) { case 'r': def_realm = optarg; @@ -240,6 +240,9 @@ char *kadmin_startup(argc, argv) } params.mask |= KADM5_CONFIG_ENCTYPES; break; + case 'O': + params.mask |= KADM5_CONFIG_OLD_AUTH_GSSAPI; + break; default: usage(); } |