kerberos: Remove un-used event context argument from smb_krb5_init_context()

The event context here was only specified in the server or admin-tool
context, which does not do network communication, so this only caused
a talloc_reference() and never any useful result.

The actual network communication code sets an event context directly
before making the network call.

Andrew Bartlett

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Mon Apr 28 02:24:57 CEST 2014 on sn-devel-104

(cherry picked from commit 086c06e361962e1c118d8eed2316e9df7834ae8b)

12 files changed, 6 insertions, 25 deletions

diff --git a/auth/credentials/credentials_krb5.c b/auth/credentials/credentials_krb5.c
index cc51f56d79b..ec6a695fd90 100644
--- a/auth/credentials/credentials_krb5.c
+++ b/auth/credentials/credentials_krb5.c
@@ -48,7 +48,7 @@ _PUBLIC_ int cli_credentials_get_krb5_context(struct cli_credentials *cred,
 		return 0;
 	}
 
-	ret = smb_krb5_init_context(cred, NULL, lp_ctx,
+	ret = smb_krb5_init_context(cred, lp_ctx,
 				    &cred->smb_krb5_context);
 	if (ret) {
 		cred->smb_krb5_context = NULL;
diff --git a/source4/auth/gensec/gensec_gssapi.c b/source4/auth/gensec/gensec_gssapi.c
index 3e35cae28c2..4fc544f3031 100644
--- a/source4/auth/gensec/gensec_gssapi.c
+++ b/source4/auth/gensec/gensec_gssapi.c
@@ -178,7 +178,6 @@ static NTSTATUS gensec_gssapi_start(struct gensec_security *gensec_security)
 	}
 
 	ret = smb_krb5_init_context(gensec_gssapi_state,
-				    NULL,
 				    gensec_security->settings->lp_ctx,
 				    &gensec_gssapi_state->smb_krb5_context);
 	if (ret) {
diff --git a/source4/auth/kerberos/krb5_init_context.c b/source4/auth/kerberos/krb5_init_context.c
index 12aab3404f9..4404b6734c0 100644
--- a/source4/auth/kerberos/krb5_init_context.c
+++ b/source4/auth/kerberos/krb5_init_context.c
@@ -474,7 +474,6 @@ smb_krb5_init_context_basic(TALLOC_CTX *tmp_ctx,
 }
 
 krb5_error_code smb_krb5_init_context(void *parent_ctx,
-				      struct tevent_context *ev,
 				      struct loadparm_context *lp_ctx,
 				      struct smb_krb5_context **smb_krb5_context)
 {
@@ -529,17 +528,6 @@ krb5_error_code smb_krb5_init_context(void *parent_ctx,
 	}
 	krb5_set_warn_dest(kctx, logf);
 
-	/* Set use of our socket lib */
-	if (ev) {
-		struct tevent_context *previous_ev;
-		ret = smb_krb5_context_set_event_ctx(*smb_krb5_context,
-						     ev, &previous_ev);
-		if (ret) {
-			talloc_free(tmp_ctx);
-			return ret;
-		}
-	}
-
 	/* Set options in kerberos */
 
 	krb5_set_dns_canonicalize_hostname(kctx,
diff --git a/source4/auth/kerberos/krb5_init_context.h b/source4/auth/kerberos/krb5_init_context.h
index b955ae508dd..3c32069ba2f 100644
--- a/source4/auth/kerberos/krb5_init_context.h
+++ b/source4/auth/kerberos/krb5_init_context.h
@@ -34,7 +34,7 @@ smb_krb5_init_context_basic(TALLOC_CTX *tmp_ctx,
 			    struct loadparm_context *lp_ctx,
 			    krb5_context *_krb5_context);
 
-krb5_error_code smb_krb5_init_context(void *parent_ctx, struct tevent_context *ev,
+krb5_error_code smb_krb5_init_context(void *parent_ctx,
 				      struct loadparm_context *lp_ctx,
 				      struct smb_krb5_context **smb_krb5_context); 
 
diff --git a/source4/dns_server/dlz_bind9.c b/source4/dns_server/dlz_bind9.c
index ac41dd02aa5..c0ed8e11cbd 100644
--- a/source4/dns_server/dlz_bind9.c
+++ b/source4/dns_server/dlz_bind9.c
@@ -623,7 +623,7 @@ _PUBLIC_ isc_result_t dlz_create(const char *dlzname,
 		lpcfg_do_global_parameter(state->lp, "log level", "0");
 	}
 
-	if (smb_krb5_init_context(state, state->ev_ctx, state->lp, &state->smb_krb5_ctx) != 0) {
+	if (smb_krb5_init_context(state, state->lp, &state->smb_krb5_ctx) != 0) {
 		result = ISC_R_NOMEMORY;
 		goto failed;
 	}
diff --git a/source4/dsdb/samdb/cracknames.c b/source4/dsdb/samdb/cracknames.c
index 5db5edee2d6..5e97efcee3f 100644
--- a/source4/dsdb/samdb/cracknames.c
+++ b/source4/dsdb/samdb/cracknames.c
@@ -663,7 +663,6 @@ WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
 		char *unparsed_name;
 
 		ret = smb_krb5_init_context(mem_ctx, 
-					    NULL,
 					    (struct loadparm_context *)ldb_get_opaque(sam_ctx, "loadparm"), 
 					    &smb_krb5_context);
 
@@ -704,7 +703,6 @@ WERROR DsCrackNameOneName(struct ldb_context *sam_ctx, TALLOC_CTX *mem_ctx,
 		char *service;
 
 		ret = smb_krb5_init_context(mem_ctx, 
-					    NULL,
 					    (struct loadparm_context *)ldb_get_opaque(sam_ctx, "loadparm"), 
 					    &smb_krb5_context);
 
diff --git a/source4/dsdb/samdb/ldb_modules/password_hash.c b/source4/dsdb/samdb/ldb_modules/password_hash.c
index 36c3f4904f1..78311c6c13e 100644
--- a/source4/dsdb/samdb/ldb_modules/password_hash.c
+++ b/source4/dsdb/samdb/ldb_modules/password_hash.c
@@ -2159,7 +2159,6 @@ static int setup_io(struct ph_context *ac,
 	/* Some operations below require kerberos contexts */
 
 	if (smb_krb5_init_context(ac,
-				  NULL,
 				  (struct loadparm_context *)ldb_get_opaque(ldb, "loadparm"),
 				  &io->smb_krb5_context) != 0) {
 		return ldb_operr(ldb);
diff --git a/source4/dsdb/samdb/ldb_modules/update_keytab.c b/source4/dsdb/samdb/ldb_modules/update_keytab.c
index afe7c27d0c4..ebf77dc9a82 100644
--- a/source4/dsdb/samdb/ldb_modules/update_keytab.c
+++ b/source4/dsdb/samdb/ldb_modules/update_keytab.c
@@ -378,7 +378,6 @@ static int update_kt_prepare_commit(struct ldb_module *module)
 	struct dn_list *p;
 	struct smb_krb5_context *smb_krb5_context;
 	int krb5_ret = smb_krb5_init_context(data,
-					     NULL,
 					     ldb_get_opaque(ldb, "loadparm"),
 					     &smb_krb5_context);
 	TALLOC_CTX *tmp_ctx;
diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c
index 996010317a8..70c071de42a 100644
--- a/source4/kdc/kdc.c
+++ b/source4/kdc/kdc.c
@@ -927,7 +927,7 @@ static void kdc_task_init(struct task_server *task)
 
 	initialize_krb5_error_table();
 
-	ret = smb_krb5_init_context(kdc, task->event_ctx, task->lp_ctx, &kdc->smb_krb5_context);
+	ret = smb_krb5_init_context(kdc, task->lp_ctx, &kdc->smb_krb5_context);
 	if (ret) {
 		DEBUG(1,("kdc_task_init: krb5_init_context failed (%s)\n",
 			 error_message(ret)));
diff --git a/source4/libnet/libnet_export_keytab.c b/source4/libnet/libnet_export_keytab.c
index 16165b81c7b..295624e9f71 100644
--- a/source4/libnet/libnet_export_keytab.c
+++ b/source4/libnet/libnet_export_keytab.c
@@ -45,7 +45,7 @@ NTSTATUS libnet_export_keytab(struct libnet_context *ctx, TALLOC_CTX *mem_ctx, s
 		return NT_STATUS_NO_MEMORY;
 	}
 
-	ret = smb_krb5_init_context(ctx, ctx->event_ctx, ctx->lp_ctx, &smb_krb5_context);
+	ret = smb_krb5_init_context(ctx, ctx->lp_ctx, &smb_krb5_context);
 	if (ret) {
 		return NT_STATUS_NO_MEMORY; 
 	}
diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c
index b5f3768fcf2..48864c8c048 100644
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -3741,7 +3741,6 @@ static NTSTATUS dcesrv_lsa_QueryDomainInformationPolicy(struct dcesrv_call_state
 		struct lsa_DomainInfoKerberos *k = &info->kerberos_info;
 		struct smb_krb5_context *smb_krb5_context;
 		int ret = smb_krb5_init_context(mem_ctx,
-							dce_call->event_ctx,
 							dce_call->conn->dce_ctx->lp_ctx,
 							&smb_krb5_context);
 		if (ret != 0) {
diff --git a/source4/torture/auth/pac.c b/source4/torture/auth/pac.c
index 64a843c07fc..c019c09672c 100644
--- a/source4/torture/auth/pac.c
+++ b/source4/torture/auth/pac.c
@@ -60,7 +60,6 @@ static bool torture_pac_self_check(struct torture_context *tctx)
 	TALLOC_CTX *mem_ctx = tctx;
 
 	torture_assert(tctx, 0 == smb_krb5_init_context(mem_ctx, 
-							NULL,
 							tctx->lp_ctx,
 							&smb_krb5_context), 
 		       "smb_krb5_init_context");
@@ -317,7 +316,7 @@ static bool torture_pac_saved_check(struct torture_context *tctx)
 	time_t authtime;
 	TALLOC_CTX *mem_ctx = tctx;
 
-	torture_assert(tctx, 0 == smb_krb5_init_context(mem_ctx, NULL,
+	torture_assert(tctx, 0 == smb_krb5_init_context(mem_ctx,
 							tctx->lp_ctx,
 							&smb_krb5_context),
 		       "smb_krb5_init_context");