Changeset 751 for trunk/server/source3/libnet/libnet_join.c

Timestamp:

Nov 29, 2012, 1:59:04 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.9

File:

• trunk/server/source3/libnet/libnet_join.c (modified) (7 diffs)

trunk/server/source3/libnet/libnet_join.c

@@ -36 +36 @@
 #include "rpc_client/init_lsa.h"
 #include "rpc_client/cli_pipe.h"
-#include "krb5_env.h"
 #include "../libcli/security/security.h"
 #include "passdb.h"
@@ -1765 +1764 @@
 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;
 }
@@ -1784 +1776 @@
 static int libnet_destroy_UnjoinCtx(struct libnet_UnjoinCtx *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;
 }
@@ -1805 +1790 @@
 {
         struct libnet_JoinCtx *ctx;
-        const char *krb5_cc_env = NULL;
 
         ctx = talloc_zero(mem_ctx, struct libnet_JoinCtx);
@@ -1817 +1801 @@
         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;
 
@@ -1838 +1815 @@
 {
         struct libnet_UnjoinCtx *ctx;
-        const char *krb5_cc_env = NULL;
 
         ctx = talloc_zero(mem_ctx, struct libnet_UnjoinCtx);
@@ -1849 +1825 @@
         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);
-        }
 
         *r = ctx;