[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-893-g512e6ca

[Günther Deschner]

The branch, v3-2-test has been updated
       via  512e6ca0a9be9fe35994ec1010110573a5b551d1 (commit)
      from  4abdbad52e456764bca1b17ead04edee1e2a2a64 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 512e6ca0a9be9fe35994ec1010110573a5b551d1
Author: Günther Deschner <gd at samba.org>
Date:   Mon Apr 14 12:20:33 2008 +0200

    libnetjoin: Fix joining when no KRB5CCNAME is around.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source/libnet/libnet_join.c |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/libnet/libnet_join.c b/source/libnet/libnet_join.c
index 16db032..51278b5 100644
--- a/source/libnet/libnet_join.c
+++ b/source/libnet/libnet_join.c
@@ -1426,10 +1426,17 @@ static WERROR libnet_join_post_processing(TALLOC_CTX *mem_ctx,
 
 static int libnet_destroy_JoinCtx(struct libnet_JoinCtx *r)
 {
+	const char *krb5_cc_env = NULL;
+
 	if (r->in.ads) {
 		ads_destroy(&r->in.ads);
 	}
 
+	krb5_cc_env = getenv(KRB5_ENV_CCNAME);
+	if (krb5_cc_env && StrCaseCmp(krb5_cc_env, "MEMORY:libnetjoin")) {
+		unsetenv(KRB5_ENV_CCNAME);
+	}
+
 	return 0;
 }
 
@@ -1452,6 +1459,7 @@ WERROR libnet_init_JoinCtx(TALLOC_CTX *mem_ctx,
 			   struct libnet_JoinCtx **r)
 {
 	struct libnet_JoinCtx *ctx;
+	const char *krb5_cc_env = NULL;
 
 	ctx = talloc_zero(mem_ctx, struct libnet_JoinCtx);
 	if (!ctx) {
@@ -1463,6 +1471,13 @@ WERROR libnet_init_JoinCtx(TALLOC_CTX *mem_ctx,
 	ctx->in.machine_name = talloc_strdup(mem_ctx, global_myname());
 	W_ERROR_HAVE_NO_MEMORY(ctx->in.machine_name);
 
+	krb5_cc_env = getenv(KRB5_ENV_CCNAME);
+	if (!krb5_cc_env || (strlen(krb5_cc_env) == 0)) {
+		krb5_cc_env = talloc_strdup(mem_ctx, "MEMORY:libnetjoin");
+		W_ERROR_HAVE_NO_MEMORY(krb5_cc_env);
+		setenv(KRB5_ENV_CCNAME, krb5_cc_env, 1);
+	}
+
 	ctx->in.secure_channel_type = SEC_CHAN_WKSTA;
 
 	*r = ctx;


-- 
Samba Shared Repository