summaryrefslogtreecommitdiff
path: root/source3/nsswitch
diff options
context:
space:
mode:
Diffstat (limited to 'source3/nsswitch')
-rw-r--r--source3/nsswitch/winbindd.h14
-rw-r--r--source3/nsswitch/winbindd_ads.c4
2 files changed, 1 insertions, 17 deletions
diff --git a/source3/nsswitch/winbindd.h b/source3/nsswitch/winbindd.h
index e8bcf76bd3..164b7ffda7 100644
--- a/source3/nsswitch/winbindd.h
+++ b/source3/nsswitch/winbindd.h
@@ -205,18 +205,4 @@ typedef struct {
#define DOM_SEQUENCE_NONE ((uint32)-1)
-/* SETENV */
-#if HAVE_SETENV
-#define SETENV(name, value, overwrite) setenv(name,value,overwrite)
-#elif HAVE_PUTENV
-#define SETENV(name, value, overwrite) \
-{ \
- fstring envvar; \
- slprintf(envvar, sizeof(fstring), "%s=%s", name, value); \
- putenv(envvar); \
-}
-#else
-#define SETENV(name, value, overwrite) ;
-#endif
-
#endif /* _WINBINDD_H */
diff --git a/source3/nsswitch/winbindd_ads.c b/source3/nsswitch/winbindd_ads.c
index 7cea4aa716..be4ed1c667 100644
--- a/source3/nsswitch/winbindd_ads.c
+++ b/source3/nsswitch/winbindd_ads.c
@@ -46,9 +46,7 @@ static ADS_STRUCT *ads_cached_connection(struct winbindd_domain *domain)
}
/* we don't want this to affect the users ccache */
- ccache = lock_path("winbindd_ccache");
- SETENV("KRB5CCNAME", ccache, 1);
- unlink(ccache);
+ setenv("KRB5CCNAME", "MEMORY:winbind_ccache", 1);
ads = ads_init(domain->alt_name, domain->name, NULL);
if (!ads) {