svn commit: samba r26205 - in branches/SAMBA_4_0: .
source/auth/credentials source/lib/ldb/ldb_ildap
source/libnet source/param source/rpc_server/lsa
jelmer at samba.org
jelmer at samba.org
Thu Nov 29 16:01:20 GMT 2007
Author: jelmer
Date: 2007-11-29 16:01:16 +0000 (Thu, 29 Nov 2007)
New Revision: 26205
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26205
Log:
Pass loadparm_context to secrets_db_connect() rather than using global context.
Modified:
branches/SAMBA_4_0/
branches/SAMBA_4_0/source/auth/credentials/credentials.c
branches/SAMBA_4_0/source/auth/credentials/credentials_files.c
branches/SAMBA_4_0/source/lib/ldb/ldb_ildap/config.mk
branches/SAMBA_4_0/source/libnet/libnet_join.c
branches/SAMBA_4_0/source/param/secrets.c
branches/SAMBA_4_0/source/param/secrets.h
branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c
Changeset:
Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...
Modified: branches/SAMBA_4_0/source/auth/credentials/credentials.c
===================================================================
--- branches/SAMBA_4_0/source/auth/credentials/credentials.c 2007-11-29 16:01:11 UTC (rev 26204)
+++ branches/SAMBA_4_0/source/auth/credentials/credentials.c 2007-11-29 16:01:16 UTC (rev 26205)
@@ -229,7 +229,6 @@
/* Set a callback to get the principal. This could be a popup dialog,
* a terminal prompt or similar. */
-
bool cli_credentials_set_principal_callback(struct cli_credentials *cred,
const char *(*principal_cb) (struct cli_credentials *))
{
Modified: branches/SAMBA_4_0/source/auth/credentials/credentials_files.c
===================================================================
--- branches/SAMBA_4_0/source/auth/credentials/credentials_files.c 2007-11-29 16:01:11 UTC (rev 26204)
+++ branches/SAMBA_4_0/source/auth/credentials/credentials_files.c 2007-11-29 16:01:16 UTC (rev 26205)
@@ -212,7 +212,7 @@
if (!ldb) {
/* Local secrets are stored in secrets.ldb */
- ldb = secrets_db_connect(mem_ctx);
+ ldb = secrets_db_connect(mem_ctx, global_loadparm);
if (!ldb) {
/* set anonymous as the fallback, if the machine account won't work */
cli_credentials_set_anonymous(cred);
Modified: branches/SAMBA_4_0/source/lib/ldb/ldb_ildap/config.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/ldb_ildap/config.mk 2007-11-29 16:01:11 UTC (rev 26204)
+++ branches/SAMBA_4_0/source/lib/ldb/ldb_ildap/config.mk 2007-11-29 16:01:16 UTC (rev 26205)
@@ -3,7 +3,7 @@
[MODULE::ldb_ildap]
SUBSYSTEM = LIBLDB
CFLAGS = -Ilib/ldb/include
-OUTPUT_TYPE = SHARED_LIBRARY
+#OUTPUT_TYPE = SHARED_LIBRARY
PRIVATE_DEPENDENCIES = LIBTALLOC LIBCLI_LDAP
INIT_FUNCTION = ldb_ildap_init
ALIASES = ldapi ldaps ldap
Modified: branches/SAMBA_4_0/source/libnet/libnet_join.c
===================================================================
--- branches/SAMBA_4_0/source/libnet/libnet_join.c 2007-11-29 16:01:11 UTC (rev 26204)
+++ branches/SAMBA_4_0/source/libnet/libnet_join.c 2007-11-29 16:01:16 UTC (rev 26205)
@@ -909,7 +909,7 @@
* Local secrets are stored in secrets.ldb
* open it to make sure we can write the info into it after the join
*/
- ldb = secrets_db_connect(tmp_mem);
+ ldb = secrets_db_connect(tmp_mem, global_loadparm);
if (!ldb) {
r->out.error_string
= talloc_asprintf(mem_ctx,
Modified: branches/SAMBA_4_0/source/param/secrets.c
===================================================================
--- branches/SAMBA_4_0/source/param/secrets.c 2007-11-29 16:01:11 UTC (rev 26204)
+++ branches/SAMBA_4_0/source/param/secrets.c 2007-11-29 16:01:16 UTC (rev 26205)
@@ -99,18 +99,18 @@
/**
connect to the secrets ldb
*/
-struct ldb_context *secrets_db_connect(TALLOC_CTX *mem_ctx)
+struct ldb_context *secrets_db_connect(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx)
{
char *path;
const char *url;
struct ldb_context *ldb;
- url = lp_secrets_url(global_loadparm);
+ url = lp_secrets_url(lp_ctx);
if (!url || !url[0]) {
return NULL;
}
- path = private_path(mem_ctx, global_loadparm, url);
+ path = private_path(mem_ctx, lp_ctx, url);
if (!path) {
return NULL;
}
@@ -123,6 +123,9 @@
return NULL;
}
+ ldb_set_modules_dir(ldb,
+ talloc_asprintf(ldb, "%s/ldb", lp_modulesdir(lp_ctx)));
+
if (ldb_connect(ldb, path, 0, NULL) != 0) {
talloc_free(path);
return NULL;
@@ -146,7 +149,7 @@
const char *attrs[] = { "objectSid", NULL };
struct dom_sid *result = NULL;
- ldb = secrets_db_connect(mem_ctx);
+ ldb = secrets_db_connect(mem_ctx, global_loadparm);
if (ldb == NULL) {
DEBUG(5, ("secrets_db_connect failed\n"));
return NULL;
Modified: branches/SAMBA_4_0/source/param/secrets.h
===================================================================
--- branches/SAMBA_4_0/source/param/secrets.h 2007-11-29 16:01:11 UTC (rev 26204)
+++ branches/SAMBA_4_0/source/param/secrets.h 2007-11-29 16:01:16 UTC (rev 26205)
@@ -44,9 +44,9 @@
*/
void secrets_shutdown(void);
bool secrets_init(void);
-struct ldb_context *secrets_db_connect(TALLOC_CTX *mem_ctx);
-struct dom_sid *secrets_get_domain_sid(TALLOC_CTX *mem_ctx,
- const char *domain);
+struct loadparm_context;
+struct ldb_context *secrets_db_connect(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx);
+struct dom_sid *secrets_get_domain_sid(TALLOC_CTX *mem_ctx, const char *domain);
#endif /* _SECRETS_H */
Modified: branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c
===================================================================
--- branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c 2007-11-29 16:01:11 UTC (rev 26204)
+++ branches/SAMBA_4_0/source/rpc_server/lsa/dcesrv_lsa.c 2007-11-29 16:01:16 UTC (rev 26205)
@@ -1713,7 +1713,8 @@
return NT_STATUS_INVALID_PARAMETER;
}
- secret_state->sam_ldb = talloc_reference(secret_state, secrets_db_connect(mem_ctx));
+ secret_state->sam_ldb = talloc_reference(secret_state, secrets_db_connect(mem_ctx,
+ global_loadparm));
/* search for the secret record */
ret = gendb_search(secret_state->sam_ldb, mem_ctx,
ldb_dn_new(mem_ctx, secret_state->sam_ldb, "cn=LSA Secrets"),
@@ -1831,7 +1832,8 @@
}
} else {
- secret_state->sam_ldb = talloc_reference(secret_state, secrets_db_connect(mem_ctx));
+ secret_state->sam_ldb = talloc_reference(secret_state,
+ secrets_db_connect(mem_ctx, global_loadparm));
secret_state->global = false;
name = r->in.name.string;
More information about the samba-cvs
mailing list