The branch, master has been updated
via 086c06e kerberos: Remove un-used event context argument from
smb_krb5_init_context()
via 7a26989 dsdb: Specify no event context to smb_krb5_init_context()
in dsdb
from 2372bd7 autorid: Add allocation from above in alloc range for well
known sids
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 086c06e361962e1c118d8eed2316e9df7834ae8b
Author: Andrew Bartlett <abart...@samba.org>
Date: Thu Apr 17 22:35:33 2014 +1200
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 <abart...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
Autobuild-User(master): Andrew Bartlett <abart...@samba.org>
Autobuild-Date(master): Mon Apr 28 02:24:57 CEST 2014 on sn-devel-104
commit 7a26989d4c62f38dcafc2a688b8cbaccc6499480
Author: Andrew Bartlett <abart...@samba.org>
Date: Thu Apr 17 21:48:30 2014 +1200
dsdb: Specify no event context to smb_krb5_init_context() in dsdb
These routines parse principals and generate keys only, no network
communication is done.
Andrew Bartlett
Signed-off-by: Andrew Bartlett <abart...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
auth/credentials/credentials_krb5.c | 2 +-
source4/auth/gensec/gensec_gssapi.c | 1 -
source4/auth/kerberos/krb5_init_context.c | 12 ------------
source4/auth/kerberos/krb5_init_context.h | 2 +-
source4/dns_server/dlz_bind9.c | 2 +-
source4/dsdb/samdb/cracknames.c | 2 --
source4/dsdb/samdb/ldb_modules/password_hash.c | 1 -
source4/dsdb/samdb/ldb_modules/update_keytab.c | 3 ++-
source4/kdc/kdc.c | 2 +-
source4/libnet/libnet_export_keytab.c | 2 +-
source4/rpc_server/lsa/dcesrv_lsa.c | 1 -
source4/torture/auth/pac.c | 3 +--
12 files changed, 8 insertions(+), 25 deletions(-)
Changeset truncated at 500 lines:
diff --git a/auth/credentials/credentials_krb5.c
b/auth/credentials/credentials_krb5.c
index 31fc9d2..489a959 100644
--- a/auth/credentials/credentials_krb5.c
+++ b/auth/credentials/credentials_krb5.c
@@ -49,7 +49,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 63fda1f..fdae2a8 100644
--- a/source4/auth/gensec/gensec_gssapi.c
+++ b/source4/auth/gensec/gensec_gssapi.c
@@ -179,7 +179,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 12aab34..4404b67 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 b955ae5..3c32069 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 f5ceb6a..677578a 100644
--- a/source4/dns_server/dlz_bind9.c
+++ b/source4/dns_server/dlz_bind9.c
@@ -630,7 +630,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 d09da25..5e97efc 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,
- ldb_get_event_context(sam_ctx),
(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,
- ldb_get_event_context(sam_ctx),
(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 1dee6af..f811463 100644
--- a/source4/dsdb/samdb/ldb_modules/password_hash.c
+++ b/source4/dsdb/samdb/ldb_modules/password_hash.c
@@ -2231,7 +2231,6 @@ static int setup_io(struct ph_context *ac,
/* Some operations below require kerberos contexts */
if (smb_krb5_init_context(ac,
- ldb_get_event_context(ldb),
(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 6b19545..42c3fa8 100644
--- a/source4/dsdb/samdb/ldb_modules/update_keytab.c
+++ b/source4/dsdb/samdb/ldb_modules/update_keytab.c
@@ -377,7 +377,8 @@ static int update_kt_prepare_commit(struct ldb_module
*module)
struct update_kt_private *data =
talloc_get_type(ldb_module_get_private(module), struct update_kt_private);
struct dn_list *p;
struct smb_krb5_context *smb_krb5_context;
- int krb5_ret = smb_krb5_init_context(data, ldb_get_event_context(ldb),
ldb_get_opaque(ldb, "loadparm"),
+ int krb5_ret = smb_krb5_init_context(data,
+ ldb_get_opaque(ldb, "loadparm"),
&smb_krb5_context);
TALLOC_CTX *tmp_ctx = NULL;
diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c
index 346b901..4a16f7e 100644
--- a/source4/kdc/kdc.c
+++ b/source4/kdc/kdc.c
@@ -918,7 +918,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 16165b8..295624e 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 6063ebe..e22a614 100644
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -3764,7 +3764,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 64a843c..c019c09 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");
--
Samba Shared Repository
