[SCM] Samba Shared Repository - branch master updated

Günther Deschner gd at samba.org
Wed Oct 26 05:24:02 MDT 2011


The branch, master has been updated
       via  d66d7c2 s3-netapi: remove pointless use_memory_krb5_ccache.
      from  0d9bd56 libcli/smb: merge NEGOTIATE_SECURITY_* flags to smb_constants.h

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit d66d7c2b00ad2ca97562c133f2e7701cae971e48
Author: Günther Deschner <gd at samba.org>
Date:   Wed Oct 26 11:46:36 2011 +0200

    s3-netapi: remove pointless use_memory_krb5_ccache.
    
    This breaks the ABI.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Wed Oct 26 13:23:58 CEST 2011 on sn-devel-104

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

Summary of changes:
 source3/lib/netapi/netapi.c |   14 --------------
 source3/lib/netapi/netapi.h |    6 ------
 2 files changed, 0 insertions(+), 20 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/lib/netapi/netapi.c b/source3/lib/netapi/netapi.c
index 9ed13fc..34609ff 100644
--- a/source3/lib/netapi/netapi.c
+++ b/source3/lib/netapi/netapi.c
@@ -278,20 +278,6 @@ NET_API_STATUS libnetapi_set_use_ccache(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;
-}
-
-/****************************************************************
 Return a libnetapi error as a string, caller must free with NetApiBufferFree
 ****************************************************************/
 
diff --git a/source3/lib/netapi/netapi.h b/source3/lib/netapi/netapi.h
index 2a52321..620d8cf 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;
@@ -1412,11 +1411,6 @@ NET_API_STATUS libnetapi_set_use_kerberos(struct libnetapi_ctx *ctx);
 NET_API_STATUS libnetapi_set_use_ccache(struct libnetapi_ctx *ctx);
 
 /****************************************************************
-****************************************************************/
-
-NET_API_STATUS libnetapi_set_use_memory_krb5_ccache(struct libnetapi_ctx *ctx);
-
-/****************************************************************
 Return a specific libnetapi error as a string, caller must free with NetApiBufferFree
 ****************************************************************/
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list