diff options
| author | Günther Deschner <gd@samba.org> | 2007-06-21 14:32:09 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:23:30 -0500 |
| commit | d7c9bbccfde0d4fdffece2272a23832ba0ae3a80 (patch) | |
| tree | 86adb366959c7627370696cf4ae89b659484c9e4 /source3/nsswitch | |
| parent | 622af1be30ad0cc9733386b6616549cd123689d8 (diff) | |
| download | samba-d7c9bbccfde0d4fdffece2272a23832ba0ae3a80.tar.gz samba-d7c9bbccfde0d4fdffece2272a23832ba0ae3a80.tar.bz2 samba-d7c9bbccfde0d4fdffece2272a23832ba0ae3a80.zip | |
r23568: Remove last traces of Heimdal KCM support (and don't misuse wbinfo where a
torture test would be much more appropriate). Fix #4408.
Guenther
(This used to be commit 7514a370cae9c6fdacffd2b885fd93cb1230ce96)
Diffstat (limited to 'source3/nsswitch')
| -rw-r--r-- | source3/nsswitch/wbinfo.c | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/source3/nsswitch/wbinfo.c b/source3/nsswitch/wbinfo.c index 6db37fca80..467afe8245 100644 --- a/source3/nsswitch/wbinfo.c +++ b/source3/nsswitch/wbinfo.c @@ -1459,37 +1459,16 @@ int main(int argc, char **argv, char **envp) break; } case 'K': { - BOOL got_error = False; uint32 flags = WBFLAG_PAM_KRB5 | WBFLAG_PAM_CACHED_LOGIN | WBFLAG_PAM_FALLBACK_AFTER_KRB5 | WBFLAG_PAM_INFO3_TEXT; - fstring tok; - int i; - const char *arg[] = { NULL, NULL }; - const char *cctypes[] = { "FILE", - "KCM", - "KCM:0", - "Garbage", - NULL, - "0"}; - - arg[0] = string_arg; - - while (next_token(arg, tok, LIST_SEP, sizeof(tok))) { - - for (i=0; i < ARRAY_SIZE(cctypes); i++) { - if (!wbinfo_auth_krb5(tok, cctypes[i], flags)) { - d_fprintf(stderr, "Could not authenticate user [%s] with " - "Kerberos (ccache: %s)\n", tok, cctypes[i]); - got_error = True; - } - } - } - if (got_error) + if (!wbinfo_auth_krb5(string_arg, "FILE", flags)) { + d_fprintf(stderr, "Could not authenticate user [%s] with " + "Kerberos (ccache: %s)\n", string_arg, "FILE"); goto done; - + } break; } case 'k': |