summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2006-03-10 13:36:39 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:15:13 -0500
commit14e904fe868eb61e4ce39db14d156f384d086743 (patch)
treef8adc77b63e8094befcf1ddb07833894dd350114 /source3
parenta2d489c187792cb18685830a8c80dd5bfed6163e (diff)
downloadsamba-14e904fe868eb61e4ce39db14d156f384d086743.tar.gz
samba-14e904fe868eb61e4ce39db14d156f384d086743.tar.bz2
samba-14e904fe868eb61e4ce39db14d156f384d086743.zip
r14148: Removing the not very well tested krb5 ticket refresh handling activated
over --with-kcm. No time to look after it for the moment. Guenther (This used to be commit 7ec2b31a8790db1466ffafeab533c11ab7ea801a)
Diffstat (limited to 'source3')
-rw-r--r--source3/client/smbspool.c10
-rw-r--r--source3/configure.in23
-rw-r--r--source3/nsswitch/winbindd_ads.c4
-rw-r--r--source3/nsswitch/winbindd_cred_cache.c3
-rw-r--r--source3/nsswitch/winbindd_pam.c9
5 files changed, 1 insertions, 48 deletions
diff --git a/source3/client/smbspool.c b/source3/client/smbspool.c
index 92e0bb4b67..245775bf6a 100644
--- a/source3/client/smbspool.c
+++ b/source3/client/smbspool.c
@@ -300,12 +300,6 @@ 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 */
@@ -349,10 +343,6 @@ char * get_ticket_cache( uid_t uid )
}
sys_closedir(tcdir);
- }
-#endif
-
-done:
if ( ticket_file == NULL )
{
diff --git a/source3/configure.in b/source3/configure.in
index 16efdf9289..37acc0c7e4 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -3529,29 +3529,6 @@ LIBS="$ac_save_LIBS"
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,
diff --git a/source3/nsswitch/winbindd_ads.c b/source3/nsswitch/winbindd_ads.c
index 721c345aa5..179659f86f 100644
--- a/source3/nsswitch/winbindd_ads.c
+++ b/source3/nsswitch/winbindd_ads.c
@@ -59,11 +59,7 @@ 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) {
diff --git a/source3/nsswitch/winbindd_cred_cache.c b/source3/nsswitch/winbindd_cred_cache.c
index 991718fb26..6835840a1d 100644
--- a/source3/nsswitch/winbindd_cred_cache.c
+++ b/source3/nsswitch/winbindd_cred_cache.c
@@ -228,8 +228,6 @@ NTSTATUS add_ccache_to_list(const char *princ_name,
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 @@ NTSTATUS add_ccache_to_list(const char *princ_name,
krb5_ticket_refresh_handler,
new_entry);
}
-#endif /* WITH_KCM */
DLIST_ADD(ccache_list, new_entry);
diff --git a/source3/nsswitch/winbindd_pam.c b/source3/nsswitch/winbindd_pam.c
index f72c442e8b..754abad9e2 100644
--- a/source3/nsswitch/winbindd_pam.c
+++ b/source3/nsswitch/winbindd_pam.c
@@ -313,7 +313,7 @@ static const char *generate_krb5_ccache(TALLOC_CTX *mem_ctx,
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 @@ static const char *generate_krb5_ccache(TALLOC_CTX *mem_ctx,
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 @@ static void setup_return_cc_name(struct winbindd_cli_state *state, const char *c
}
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));