svn commit: samba r14506 - branches/SAMBA_3_0/source/libsmb branches/SAMBA_3_0/source/printing trunk/source/libsmb trunk/source/printing

[gd at samba.org]

Author: gd
Date: 2006-03-17 10:22:13 +0000 (Fri, 17 Mar 2006)
New Revision: 14506

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

Log:
Remove remaining references to a KCM credential cache type.

Guenther

Modified:
   branches/SAMBA_3_0/source/libsmb/clikrb5.c
   branches/SAMBA_3_0/source/printing/nt_printing.c
   trunk/source/libsmb/clikrb5.c
   trunk/source/printing/nt_printing.c


Changeset:
Modified: branches/SAMBA_3_0/source/libsmb/clikrb5.c
===================================================================
--- branches/SAMBA_3_0/source/libsmb/clikrb5.c	2006-03-17 10:14:33 UTC (rev 14505)
+++ branches/SAMBA_3_0/source/libsmb/clikrb5.c	2006-03-17 10:22:13 UTC (rev 14506)
@@ -426,7 +426,7 @@
 	   use memory ccaches, and a FILE one probably means that
 	   we're using creds obtained outside of our exectuable
 	*/
-	if (strequal(cc_type, "KCM") || strequal(cc_type, "FILE")) {
+	if (strequal(cc_type, "FILE")) {
 		DEBUG(5, ("ads_cleanup_expired_creds: We do not remove creds from a %s ccache\n", cc_type));
 		return False;
 	}

Modified: branches/SAMBA_3_0/source/printing/nt_printing.c
===================================================================
--- branches/SAMBA_3_0/source/printing/nt_printing.c	2006-03-17 10:14:33 UTC (rev 14505)
+++ branches/SAMBA_3_0/source/printing/nt_printing.c	2006-03-17 10:22:13 UTC (rev 14506)
@@ -3125,11 +3125,7 @@
 		win_rc = WERR_SERVER_UNAVAILABLE;
 		goto done;
 	}
-#ifdef HAVE_KCM
-	setenv(KRB5_ENV_CCNAME, "KCM:SYSTEM", 1);
-#else
 	setenv(KRB5_ENV_CCNAME, "MEMORY:prtpub_cache", 1);
-#endif
 	SAFE_FREE(ads->auth.password);
 	ads->auth.password = secrets_fetch_machine_password(lp_workgroup(),
 		NULL, NULL);

Modified: trunk/source/libsmb/clikrb5.c
===================================================================
--- trunk/source/libsmb/clikrb5.c	2006-03-17 10:14:33 UTC (rev 14505)
+++ trunk/source/libsmb/clikrb5.c	2006-03-17 10:22:13 UTC (rev 14506)
@@ -426,7 +426,7 @@
 	   use memory ccaches, and a FILE one probably means that
 	   we're using creds obtained outside of our exectuable
 	*/
-	if (strequal(cc_type, "KCM") || strequal(cc_type, "FILE")) {
+	if (strequal(cc_type, "FILE")) {
 		DEBUG(5, ("ads_cleanup_expired_creds: We do not remove creds from a %s ccache\n", cc_type));
 		return False;
 	}

Modified: trunk/source/printing/nt_printing.c
===================================================================
--- trunk/source/printing/nt_printing.c	2006-03-17 10:14:33 UTC (rev 14505)
+++ trunk/source/printing/nt_printing.c	2006-03-17 10:22:13 UTC (rev 14506)
@@ -3125,11 +3125,7 @@
 		win_rc = WERR_SERVER_UNAVAILABLE;
 		goto done;
 	}
-#ifdef HAVE_KCM
-	setenv(KRB5_ENV_CCNAME, "KCM:SYSTEM", 1);
-#else
 	setenv(KRB5_ENV_CCNAME, "MEMORY:prtpub_cache", 1);
-#endif
 	SAFE_FREE(ads->auth.password);
 	ads->auth.password = secrets_fetch_machine_password(lp_workgroup(),
 		NULL, NULL);