Author: gd Date: 2006-03-10 13:36:39 +0000 (Fri, 10 Mar 2006) New Revision: 14148
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14148 Log: Removing the not very well tested krb5 ticket refresh handling activated over --with-kcm. No time to look after it for the moment. Guenther Modified: branches/SAMBA_3_0/source/client/smbspool.c branches/SAMBA_3_0/source/configure.in branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c branches/SAMBA_3_0/source/nsswitch/winbindd_cred_cache.c branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c trunk/source/client/smbspool.c trunk/source/configure.in trunk/source/nsswitch/winbindd_ads.c trunk/source/nsswitch/winbindd_cred_cache.c trunk/source/nsswitch/winbindd_pam.c Changeset: Modified: branches/SAMBA_3_0/source/client/smbspool.c =================================================================== --- branches/SAMBA_3_0/source/client/smbspool.c 2006-03-10 13:33:02 UTC (rev 14147) +++ branches/SAMBA_3_0/source/client/smbspool.c 2006-03-10 13:36:39 UTC (rev 14148) @@ -300,12 +300,6 @@ 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 */ @@ -349,11 +343,7 @@ } sys_closedir(tcdir); - } -#endif -done: - if ( ticket_file == NULL ) { /* no ticket cache found */ Modified: branches/SAMBA_3_0/source/configure.in =================================================================== --- branches/SAMBA_3_0/source/configure.in 2006-03-10 13:33:02 UTC (rev 14147) +++ branches/SAMBA_3_0/source/configure.in 2006-03-10 13:36:39 UTC (rev 14148) @@ -3529,29 +3529,6 @@ fi ################################################# -# check for KCM support - -with_kcm_support=no -AC_MSG_CHECKING([for KCM support]) - -AC_ARG_WITH(kcm, -[ --with-kcm KCM support (default no)], -[ case "$withval" in - yes) - if test x$FOUND_KRB5 = x"no"; then - AC_MSG_ERROR(libkrb5 is needed for KCM support) - fi - with_kcm_support="$withval" - AC_DEFINE(WITH_KCM,1,[Whether to include KCM support]) - ;; - *) - with_kcm_support="no" - AC_DEFINE(WITH_KCM,0,[Whether to include KCM support]) - ;; - esac ]) - -AC_MSG_RESULT($with_kcm_support) -################################################# # check for automount support AC_MSG_CHECKING(whether to use automount) AC_ARG_WITH(automount, Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c =================================================================== --- branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c 2006-03-10 13:33:02 UTC (rev 14147) +++ branches/SAMBA_3_0/source/nsswitch/winbindd_ads.c 2006-03-10 13:36:39 UTC (rev 14148) @@ -59,11 +59,7 @@ } /* 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) { Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_cred_cache.c =================================================================== --- branches/SAMBA_3_0/source/nsswitch/winbindd_cred_cache.c 2006-03-10 13:33:02 UTC (rev 14147) +++ branches/SAMBA_3_0/source/nsswitch/winbindd_cred_cache.c 2006-03-10 13:36:39 UTC (rev 14148) @@ -228,8 +228,6 @@ new_entry->uid = uid; -#ifndef WITH_KCM /* no point in doing the refresh in KCM and by ourself */ - if (schedule_refresh_event && renew_until > 0) { struct timeval t = timeval_set((ticket_end -1 ), 0); @@ -240,7 +238,6 @@ krb5_ticket_refresh_handler, new_entry); } -#endif /* WITH_KCM */ DLIST_ADD(ccache_list, new_entry); Modified: branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c =================================================================== --- branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c 2006-03-10 13:33:02 UTC (rev 14147) +++ branches/SAMBA_3_0/source/nsswitch/winbindd_pam.c 2006-03-10 13:36:39 UTC (rev 14148) @@ -313,7 +313,7 @@ uid_t uid, BOOL *internal_ccache) { - /* accept KCM, FILE and WRFILE as krb5_cc_type from the client and then + /* accept FILE and WRFILE as krb5_cc_type from the client and then * build the full ccname string based on the user's uid here - * Guenther*/ @@ -333,10 +333,6 @@ gen_cc = talloc_asprintf(mem_ctx, "FILE:/tmp/krb5cc_%d", uid); } else if (strequal(type, "WRFILE")) { gen_cc = talloc_asprintf(mem_ctx, "WRFILE:/tmp/krb5cc_%d", uid); -#ifdef WITH_KCM - } else if (strequal(type, "KCM")) { - gen_cc = talloc_asprintf(mem_ctx, "KCM:%d", uid); -#endif } else { DEBUG(10,("we don't allow to set a %s type ccache\n", type)); goto memory_ccache; @@ -383,9 +379,6 @@ } if (!strequal(type, "FILE") && -#ifdef WITH_KCM - !strequal(type, "KCM") && -#endif !strequal(type, "WRFILE")) { DEBUG(10,("won't return krbccname for a %s type ccache\n", type)); Modified: trunk/source/client/smbspool.c =================================================================== --- trunk/source/client/smbspool.c 2006-03-10 13:33:02 UTC (rev 14147) +++ trunk/source/client/smbspool.c 2006-03-10 13:36:39 UTC (rev 14148) @@ -300,12 +300,6 @@ 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 */ @@ -349,11 +343,7 @@ } sys_closedir(tcdir); - } -#endif -done: - if ( ticket_file == NULL ) { /* no ticket cache found */ Modified: trunk/source/configure.in =================================================================== --- trunk/source/configure.in 2006-03-10 13:33:02 UTC (rev 14147) +++ trunk/source/configure.in 2006-03-10 13:36:39 UTC (rev 14148) @@ -3529,29 +3529,6 @@ fi ################################################# -# check for KCM support - -with_kcm_support=no -AC_MSG_CHECKING([for KCM support]) - -AC_ARG_WITH(kcm, -[ --with-kcm KCM support (default no)], -[ case "$withval" in - yes) - if test x$FOUND_KRB5 = x"no"; then - AC_MSG_ERROR(libkrb5 is needed for KCM support) - fi - with_kcm_support="$withval" - AC_DEFINE(WITH_KCM,1,[Whether to include KCM support]) - ;; - *) - with_kcm_support="no" - AC_DEFINE(WITH_KCM,0,[Whether to include KCM support]) - ;; - esac ]) - -AC_MSG_RESULT($with_kcm_support) -################################################# # check for automount support AC_MSG_CHECKING(whether to use automount) AC_ARG_WITH(automount, Modified: trunk/source/nsswitch/winbindd_ads.c =================================================================== --- trunk/source/nsswitch/winbindd_ads.c 2006-03-10 13:33:02 UTC (rev 14147) +++ trunk/source/nsswitch/winbindd_ads.c 2006-03-10 13:36:39 UTC (rev 14148) @@ -59,11 +59,7 @@ } /* 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) { Modified: trunk/source/nsswitch/winbindd_cred_cache.c =================================================================== --- trunk/source/nsswitch/winbindd_cred_cache.c 2006-03-10 13:33:02 UTC (rev 14147) +++ trunk/source/nsswitch/winbindd_cred_cache.c 2006-03-10 13:36:39 UTC (rev 14148) @@ -228,8 +228,6 @@ new_entry->uid = uid; -#ifndef WITH_KCM /* no point in doing the refresh in KCM and by ourself */ - if (schedule_refresh_event && renew_until > 0) { struct timeval t = timeval_set((ticket_end -1 ), 0); @@ -240,7 +238,6 @@ krb5_ticket_refresh_handler, new_entry); } -#endif /* WITH_KCM */ DLIST_ADD(ccache_list, new_entry); Modified: trunk/source/nsswitch/winbindd_pam.c =================================================================== --- trunk/source/nsswitch/winbindd_pam.c 2006-03-10 13:33:02 UTC (rev 14147) +++ trunk/source/nsswitch/winbindd_pam.c 2006-03-10 13:36:39 UTC (rev 14148) @@ -313,7 +313,7 @@ uid_t uid, BOOL *internal_ccache) { - /* accept KCM, FILE and WRFILE as krb5_cc_type from the client and then + /* accept FILE and WRFILE as krb5_cc_type from the client and then * build the full ccname string based on the user's uid here - * Guenther*/ @@ -333,10 +333,6 @@ gen_cc = talloc_asprintf(mem_ctx, "FILE:/tmp/krb5cc_%d", uid); } else if (strequal(type, "WRFILE")) { gen_cc = talloc_asprintf(mem_ctx, "WRFILE:/tmp/krb5cc_%d", uid); -#ifdef WITH_KCM - } else if (strequal(type, "KCM")) { - gen_cc = talloc_asprintf(mem_ctx, "KCM:%d", uid); -#endif } else { DEBUG(10,("we don't allow to set a %s type ccache\n", type)); goto memory_ccache; @@ -383,9 +379,6 @@ } if (!strequal(type, "FILE") && -#ifdef WITH_KCM - !strequal(type, "KCM") && -#endif !strequal(type, "WRFILE")) { DEBUG(10,("won't return krbccname for a %s type ccache\n", type));
