svn commit: samba r23568 - in branches: SAMBA_3_0/source/nsswitch SAMBA_3_0_25/source/nsswitch SAMBA_3_0_26/source/nsswitch

[gd at samba.org]

Author: gd
Date: 2007-06-21 14:32:09 +0000 (Thu, 21 Jun 2007)
New Revision: 23568

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23568

Log:
Remove last traces of Heimdal KCM support (and don't misuse wbinfo where a
torture test would be much more appropriate). Fix #4408.

Guenther

Modified:
   branches/SAMBA_3_0/source/nsswitch/wbinfo.c
   branches/SAMBA_3_0_25/source/nsswitch/wbinfo.c
   branches/SAMBA_3_0_26/source/nsswitch/wbinfo.c


Changeset:
Modified: branches/SAMBA_3_0/source/nsswitch/wbinfo.c
===================================================================
--- branches/SAMBA_3_0/source/nsswitch/wbinfo.c	2007-06-21 14:30:40 UTC (rev 23567)
+++ branches/SAMBA_3_0/source/nsswitch/wbinfo.c	2007-06-21 14:32:09 UTC (rev 23568)
@@ -1459,37 +1459,16 @@
 				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':

Modified: branches/SAMBA_3_0_25/source/nsswitch/wbinfo.c
===================================================================
--- branches/SAMBA_3_0_25/source/nsswitch/wbinfo.c	2007-06-21 14:30:40 UTC (rev 23567)
+++ branches/SAMBA_3_0_25/source/nsswitch/wbinfo.c	2007-06-21 14:32:09 UTC (rev 23568)
@@ -1459,37 +1459,16 @@
 				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':

Modified: branches/SAMBA_3_0_26/source/nsswitch/wbinfo.c
===================================================================
--- branches/SAMBA_3_0_26/source/nsswitch/wbinfo.c	2007-06-21 14:30:40 UTC (rev 23567)
+++ branches/SAMBA_3_0_26/source/nsswitch/wbinfo.c	2007-06-21 14:32:09 UTC (rev 23568)
@@ -1459,37 +1459,16 @@
 				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':