diff options
| author | Günther Deschner <gd@samba.org> | 2011-10-27 16:28:27 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2011-10-28 13:09:47 +0200 |
| commit | 2330e52cacef0f1cf0e766cd25d23715be5102ef (patch) | |
| tree | 5b7780064514ebe8d4758fee557fdeaf69d3a1b7 | |
| parent | 0b6ced62096cf31142b329056c0d0066d04b344c (diff) | |
| download | samba-2330e52cacef0f1cf0e766cd25d23715be5102ef.tar.gz | |
s3-passdb: use tevent_context in passdb.
Guenther
Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Fri Oct 28 13:09:47 CEST 2011 on sn-devel-104
| -rw-r--r-- | source3/include/passdb.h | 5 | ||||
| -rw-r--r-- | source3/passdb/pdb_interface.c | 10 | ||||
| -rw-r--r-- | source3/passdb/pdb_ldap.c | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/source3/include/passdb.h b/source3/include/passdb.h index 70b21c9b042..37d35cfee3d 100644 --- a/source3/include/passdb.h +++ b/source3/include/passdb.h @@ -32,6 +32,7 @@ #endif #include "../librpc/gen_ndr/lsa.h" +#include <tevent.h> /* group mapping headers */ @@ -801,7 +802,7 @@ bool pdb_element_is_set_or_changed(const struct samu *sampass, NTSTATUS smb_register_passdb(int version, const char *name, pdb_init_function init) ; struct pdb_init_function_entry *pdb_find_backend_entry(const char *name); const struct pdb_init_function_entry *pdb_get_backends(void); -struct event_context *pdb_get_event_context(void); +struct tevent_context *pdb_get_tevent_context(void); NTSTATUS make_pdb_method_name(struct pdb_methods **methods, const char *selected); struct pdb_domain_info *pdb_get_domain_info(TALLOC_CTX *mem_ctx); bool pdb_getsampwnam(struct samu *sam_acct, const char *username) ; @@ -872,7 +873,7 @@ bool pdb_sid_to_id(const struct dom_sid *sid, uid_t *uid, gid_t *gid, enum lsa_SidType *type); uint32_t pdb_capabilities(void); bool pdb_new_rid(uint32_t *rid); -bool initialize_password_db(bool reload, struct event_context *event_ctx); +bool initialize_password_db(bool reload, struct tevent_context *tevent_ctx); struct pdb_search *pdb_search_init(TALLOC_CTX *mem_ctx, enum pdb_search_type type); struct pdb_search *pdb_search_users(TALLOC_CTX *mem_ctx, uint32_t acct_flags); diff --git a/source3/passdb/pdb_interface.c b/source3/passdb/pdb_interface.c index a6a777436ec..b202d43a5be 100644 --- a/source3/passdb/pdb_interface.c +++ b/source3/passdb/pdb_interface.c @@ -116,11 +116,11 @@ const struct pdb_init_function_entry *pdb_get_backends(void) * smb_idle_event_list that used to exist in lib/module.c. -- VL */ -static struct event_context *pdb_event_ctx; +static struct tevent_context *pdb_tevent_ctx; -struct event_context *pdb_get_event_context(void) +struct tevent_context *pdb_get_tevent_context(void) { - return pdb_event_ctx; + return pdb_tevent_ctx; } /****************************************************************** @@ -1315,9 +1315,9 @@ bool pdb_new_rid(uint32_t *rid) If uninitialised, context will auto-init on first use. ***************************************************************/ -bool initialize_password_db(bool reload, struct event_context *event_ctx) +bool initialize_password_db(bool reload, struct tevent_context *tevent_ctx) { - pdb_event_ctx = event_ctx; + pdb_tevent_ctx = tevent_ctx; return (pdb_get_methods_reload(reload) != NULL); } diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c index feda002d133..b59eeb9a7e7 100644 --- a/source3/passdb/pdb_ldap.c +++ b/source3/passdb/pdb_ldap.c @@ -6487,7 +6487,7 @@ static NTSTATUS pdb_init_ldapsam_common(struct pdb_methods **pdb_method, const c return NT_STATUS_NO_MEMORY; } - nt_status = smbldap_init(*pdb_method, pdb_get_event_context(), + nt_status = smbldap_init(*pdb_method, pdb_get_tevent_context(), location, &ldap_state->smbldap_state); if ( !NT_STATUS_IS_OK(nt_status) ) { |