From: Günther Deschner <gd@samba.org>
Date: Wed, 26 Oct 2011 13:03:23 +0000 (+0200)
Subject: s3-netapi: remove pointless use_memory_krb5_ccache.
X-Git-Tag: samba-3.6.2~96
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=389e98a85975dd2b410d32ae96ccaf61f7b77ff4;p=thirdparty%2Fsamba.git

s3-netapi: remove pointless use_memory_krb5_ccache.

This breaks the ABI.

Guenther

See bug #7465 for more details.
(cherry picked from commit 2970d44442c2e6e80fb18f5c669d347e5f5be62e)
---

diff --git a/source3/lib/netapi/netapi.c b/source3/lib/netapi/netapi.c
index dc42049b242..ffb84b00052 100644
--- a/source3/lib/netapi/netapi.c
+++ b/source3/lib/netapi/netapi.c
@@ -262,20 +262,6 @@ NET_API_STATUS libnetapi_set_use_kerberos(struct libnetapi_ctx *ctx)
 /****************************************************************
 ****************************************************************/
 
-NET_API_STATUS libnetapi_set_use_memory_krb5_ccache(struct libnetapi_ctx *ctx)
-{
-	ctx->krb5_cc_env = talloc_strdup(ctx, "MEMORY:libnetapi");
-	if (!ctx->krb5_cc_env) {
-		return W_ERROR_V(WERR_NOMEM);
-	}
-	setenv(KRB5_ENV_CCNAME, ctx->krb5_cc_env, 1);
-	ctx->use_memory_krb5_ccache = 1;
-	return NET_API_STATUS_SUCCESS;
-}
-
-/****************************************************************
-****************************************************************/
-
 NET_API_STATUS libnetapi_set_use_ccache(struct libnetapi_ctx *ctx)
 {
 	ctx->use_ccache = true;
diff --git a/source3/lib/netapi/netapi.h b/source3/lib/netapi/netapi.h
index a55dc5e0b9b..9e1549df0eb 100644
--- a/source3/lib/netapi/netapi.h
+++ b/source3/lib/netapi/netapi.h
@@ -1356,7 +1356,6 @@ struct libnetapi_ctx {
 	char *krb5_cc_env;
 	int use_kerberos;
 	int use_ccache;
-	int use_memory_krb5_ccache;
 	int disable_policy_handle_cache;
 
 	void *private_data;
@@ -1409,11 +1408,6 @@ NET_API_STATUS libnetapi_set_use_kerberos(struct libnetapi_ctx *ctx);
 /****************************************************************
 ****************************************************************/
 
-NET_API_STATUS libnetapi_set_use_memory_krb5_ccache(struct libnetapi_ctx *ctx);
-
-/****************************************************************
-****************************************************************/
-
 NET_API_STATUS libnetapi_set_use_ccache(struct libnetapi_ctx *ctx);
 
 /****************************************************************