The branch, master has been updated
via f271469931f83c7b3cf81a9911ff15f761925ad1 (commit)
via 37b6950961064ef443a91e8bc415a5c582a2d0a6 (commit)
from a255f9ce713b29552722ec73e4038226959e1c8e (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f271469931f83c7b3cf81a9911ff15f761925ad1
Author: Stefan Metzmacher <[email protected]>
Date: Mon Dec 29 09:37:02 2008 +0100
s4:kdc: pass down event_context explicit
metze
commit 37b6950961064ef443a91e8bc415a5c582a2d0a6
Author: Stefan Metzmacher <[email protected]>
Date: Mon Dec 29 09:36:20 2008 +0100
s4:libnet_samdump_keytab: pass down event_context explicit
metze
-----------------------------------------------------------------------
Summary of changes:
source4/kdc/hdb-samba4.c | 2 +-
source4/kdc/kdc.c | 2 ++
source4/kdc/kdc.h | 1 +
source4/libnet/libnet_samdump_keytab.c | 4 +++-
4 files changed, 7 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/kdc/hdb-samba4.c b/source4/kdc/hdb-samba4.c
index b6a48e7..ff26726 100644
--- a/source4/kdc/hdb-samba4.c
+++ b/source4/kdc/hdb-samba4.c
@@ -1548,7 +1548,7 @@ krb5_error_code hdb_samba4_create(krb5_context context,
struct HDB **db, const c
{
NTSTATUS nt_status;
/* The global kdc_mem_ctx and kdc_lp_ctx, Disgusting, ugly hack, but it
means one less private hook */
- nt_status = kdc_hdb_samba4_create(kdc_mem_ctx,
event_context_find(kdc_mem_ctx), kdc_lp_ctx,
+ nt_status = kdc_hdb_samba4_create(kdc_mem_ctx, kdc_ev_ctx, kdc_lp_ctx,
context, db, arg);
if (NT_STATUS_IS_OK(nt_status)) {
diff --git a/source4/kdc/kdc.c b/source4/kdc/kdc.c
index 45fa803..81ac94c 100644
--- a/source4/kdc/kdc.c
+++ b/source4/kdc/kdc.c
@@ -44,6 +44,7 @@
/* Disgusting hack to get a mem_ctx and lp_ctx into the hdb plugin, when
* used as a keytab */
TALLOC_CTX *kdc_mem_ctx;
+struct event_context *kdc_ev_ctx;
struct loadparm_context *kdc_lp_ctx;
/* hold all the info needed to send a reply */
@@ -765,6 +766,7 @@ static void kdc_task_init(struct task_server *task)
krb5_kdc_windc_init(kdc->smb_krb5_context->krb5_context);
kdc_mem_ctx = kdc->smb_krb5_context;
+ kdc_ev_ctx = task->event_ctx;
kdc_lp_ctx = task->lp_ctx;
/* start listening on the configured network interfaces */
diff --git a/source4/kdc/kdc.h b/source4/kdc/kdc.h
index 7e82ad2..2ea7509 100644
--- a/source4/kdc/kdc.h
+++ b/source4/kdc/kdc.h
@@ -31,6 +31,7 @@ struct kdc_server;
struct socket_address;
extern TALLOC_CTX *kdc_mem_ctx;
+extern struct event_context *kdc_ev_ctx;
extern struct loadparm_context *kdc_lp_ctx;
bool kpasswdd_process(struct kdc_server *kdc,
diff --git a/source4/libnet/libnet_samdump_keytab.c
b/source4/libnet/libnet_samdump_keytab.c
index 4b71b0c..62d9390 100644
--- a/source4/libnet/libnet_samdump_keytab.c
+++ b/source4/libnet/libnet_samdump_keytab.c
@@ -70,6 +70,7 @@ static NTSTATUS samdump_keytab_handle_user(TALLOC_CTX
*mem_ctx,
struct libnet_samdump_keytab_data {
const char *keytab_name;
+ struct event_context *ev_ctx;
struct loadparm_context *lp_ctx;
};
@@ -88,7 +89,7 @@ static NTSTATUS libnet_samdump_keytab_fn(TALLOC_CTX *mem_ctx,
/* not interested in builtin users */
if (database == SAM_DATABASE_DOMAIN) {
nt_status = samdump_keytab_handle_user(mem_ctx,
-
event_context_find(mem_ctx),
+ data->ev_ctx,
data->lp_ctx,
data->keytab_name,
delta);
@@ -109,6 +110,7 @@ NTSTATUS libnet_SamDump_keytab(struct libnet_context *ctx,
TALLOC_CTX *mem_ctx,
struct libnet_SamSync r2;
data.keytab_name = r->in.keytab_name;
+ data.ev_ctx = ctx->event_ctx;
data.lp_ctx = ctx->lp_ctx;
r2.out.error_string = NULL;
--
Samba Shared Repository
