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

diff --git a/source/nsswitch/wbinfo.c b/source/nsswitch/wbinfo.c
index 6db37fca80fcf528bea7580f0b4090a85d9ff78d..467afe82457bd188dbc1f3fc9cc6b226073f7f70 100644 (file)
--- a/source/nsswitch/wbinfo.c
+++ b/source/nsswitch/wbinfo.c
@@ -1459,37 +1459,16 @@ int main(int argc, char **argv, char **envp)
                                break;
                        }
                case 'K': {
                                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;
                                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;
                                        goto done;

-
+                               }

                                break;
                        }
                case 'k':
                                break;
                        }
                case 'k':