sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-10-22 07:33:16 +03:00
Code Activity

r25446: Merge some changes I made on the way home from SFO:

Browse Source 
2007-09-29 More higher-level passing around of lp_ctx.
2007-09-29 Fix warning.
2007-09-29 Pass loadparm contexts on a higher level.
2007-09-29 Avoid using global loadparm context.
This commit is contained in:
Jelmer Vernooij
2007-10-01 18:52:55 +00:00
committed by Gerald (Jerry) Carter
parent 315ffc0191
commit 3468952e77
63 changed files with 198 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/scripting/ejs/smbcalls.c
View File

@@ -184,7 +184,7 @@ void smb_setup_ejs_functions(void (*exception_handler)(const char *))
smb_setup_ejs_param();
smb_setup_ejs_literal();
shared_init = load_samba_modules(NULL, "smbcalls");
shared_init = load_samba_modules(NULL, global_loadparm, "smbcalls");
run_init_functions(static_init);
run_init_functions(shared_init);

10
source/scripting/ejs/smbcalls_auth.c
View File

@@ -30,9 +30,11 @@
#include "libcli/security/security.h"
static int ejs_doauth(MprVarHandle eid,
TALLOC_CTX *tmp_ctx, struct MprVar *auth, const char *username,
const char *password, const char *domain, const char *workstation,
struct socket_address *remote_host, const char **auth_types)
TALLOC_CTX *tmp_ctx, struct MprVar *auth,
const char *username, const char *password,
const char *domain, const char *workstation,
struct socket_address *remote_host,
const char **auth_types)
{
struct auth_usersupplied_info *user_info = NULL;
struct auth_serversupplied_info *server_info = NULL;
@@ -54,7 +56,7 @@ static int ejs_doauth(MprVarHandle eid,
} else {
/* Hope we can find the event context somewhere up there... */
ev = event_context_find(tmp_ctx);
msg = messaging_client_init(tmp_ctx, ev);
msg = messaging_client_init(tmp_ctx, global_loadparm, ev);
}
if (auth_types) {

2
source/scripting/ejs/smbcalls_ldb.c
View File

@@ -452,7 +452,7 @@ static int ejs_ldbConnect(MprVarHandle eid, int argc, char **argv)
dbfile = argv[0];
ldb = ldb_wrap_connect(mprMemCtx(), dbfile,
ldb = ldb_wrap_connect(mprMemCtx(), global_loadparm, dbfile,
session_info, creds,
0, (const char **)(argv+1));
if (ldb == NULL) {

4
source/scripting/ejs/smbcalls_rpc.c
View File

@@ -78,7 +78,9 @@ static int ejs_irpc_connect(MprVarHandle eid, int argc, char **argv)
/* create a messaging context, looping as we have no way to
allocate temporary server ids automatically */
for (i=0;i<10000;i++) {
p->msg_ctx = messaging_init(p, cluster_id(EJS_ID_BASE + i), ev);
p->msg_ctx = messaging_init(p,
lp_messaging_path(p, global_loadparm),
cluster_id(EJS_ID_BASE + i), ev);
if (p->msg_ctx) break;
}
if (p->msg_ctx == NULL) {