Add missing WITH_KCM hunks from my local tree.

Guenther

git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_3_0@14145 0c0555d6-39d7-0310-84fc-f1cc0bd64818

diff --git a/source/client/smbspool.c b/source/client/smbspool.c
index d7a02b76f937014c62821b79ee3a0b10852771e3..92e0bb4b674b3ec57567accd2635fd6d2db8e647 100644 (file)
--- a/source/client/smbspool.c
+++ b/source/client/smbspool.c
@@ -299,15 +299,21 @@ list_devices(void)
 static
 char * get_ticket_cache( uid_t uid )
 {
+  char *ticket_file = NULL;
+
+#ifdef WITH_KCM
+  snprintf(ticket_file, CC_MAX_FILE_LEN, "KCM:%d", uid );
+  goto done;
+#else
+ {
   SMB_STRUCT_DIR *tcdir;                  /* directory where ticket caches are stored */
   SMB_STRUCT_DIRENT *dirent;   /* directory entry */
   char *filename = NULL;       /* holds file names on the tmp directory */
   SMB_STRUCT_STAT buf;        
   char user_cache_prefix[CC_MAX_FILE_LEN];
   char file_path[CC_MAX_FILE_PATH_LEN];
-  char *ticket_file = NULL;
   time_t t = 0;
-  
+
   snprintf(user_cache_prefix, CC_MAX_FILE_LEN, "%s%d", CC_PREFIX, uid );
   tcdir = sys_opendir( TICKET_CC_DIR );
   if ( tcdir == NULL ) 
@@ -343,6 +349,10 @@ char * get_ticket_cache( uid_t uid )
   }
 
   sys_closedir(tcdir);
+ }
+#endif
+
+done:
 
   if ( ticket_file == NULL )
   {

diff --git a/source/nsswitch/winbindd_ads.c b/source/nsswitch/winbindd_ads.c
index 179659f86f1c03a492459e76edf3b53f2f80e539..721c345aa5b47d93523e3bf8e40b661e6bd10f60 100644 (file)
--- a/source/nsswitch/winbindd_ads.c
+++ b/source/nsswitch/winbindd_ads.c
@@ -59,7 +59,11 @@ static ADS_STRUCT *ads_cached_connection(struct winbindd_domain *domain)
        }
 
        /* we don't want this to affect the users ccache */
+#ifdef WITH_KCM
+       setenv("KRB5CCNAME", "KCM:SYSTEM", 1);
+#else
        setenv("KRB5CCNAME", "MEMORY:winbind_ccache", 1);
+#endif
 
        ads = ads_init(domain->alt_name, domain->name, NULL);
        if (!ads) {