Author: jelmer Date: 2006-04-04 16:20:32 +0000 (Tue, 04 Apr 2006) New Revision: 14909
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14909 Log: Add lp_modulesdir() smb.conf option Modified: branches/SAMBA_4_0/source/param/loadparm.c branches/SAMBA_4_0/source/param/util.c Changeset: Modified: branches/SAMBA_4_0/source/param/loadparm.c =================================================================== --- branches/SAMBA_4_0/source/param/loadparm.c 2006-04-04 15:37:30 UTC (rev 14908) +++ branches/SAMBA_4_0/source/param/loadparm.c 2006-04-04 16:20:32 UTC (rev 14909) @@ -98,6 +98,7 @@ char *ncalrpc_dir; char *display_charset; char *szLockDir; + char *szModulesDir; char *szPidDir; char *szSetupDir; char *szServerString; @@ -528,6 +529,7 @@ {"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, {"lock dir", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, FLAG_HIDE}, {"lock directory", P_STRING, P_GLOBAL, &Globals.szLockDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, + {"modules dir", P_STRING, P_GLOBAL, &Globals.szModulesDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, {"pid directory", P_STRING, P_GLOBAL, &Globals.szPidDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, {"js include", P_LIST, P_GLOBAL, &Globals.jsInclude, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, {"setup directory", P_STRING, P_GLOBAL, &Globals.szSetupDir, NULL, NULL, FLAG_ADVANCED | FLAG_DEVELOPER}, @@ -629,6 +631,7 @@ do_parameter("pid directory", dyn_PIDDIR, NULL); do_parameter("lock dir", dyn_LOCKDIR, NULL); + do_parameter("modules dir", dyn_MODULESDIR, NULL); do_parameter("ncalrpc dir", dyn_NCALRPCDIR, NULL); do_parameter("socket address", "0.0.0.0", NULL); @@ -828,6 +831,7 @@ _PUBLIC_ FN_GLOBAL_STRING(lp_private_dir, &Globals.szPrivateDir) _PUBLIC_ FN_GLOBAL_STRING(lp_serverstring, &Globals.szServerString) _PUBLIC_ FN_GLOBAL_STRING(lp_lockdir, &Globals.szLockDir) +_PUBLIC_ FN_GLOBAL_STRING(lp_modulesdir, &Globals.szModulesDir) _PUBLIC_ FN_GLOBAL_STRING(lp_setupdir, &Globals.szSetupDir) _PUBLIC_ FN_GLOBAL_STRING(lp_ncalrpc_dir, &Globals.ncalrpc_dir) _PUBLIC_ FN_GLOBAL_STRING(lp_piddir, &Globals.szPidDir) Modified: branches/SAMBA_4_0/source/param/util.c =================================================================== --- branches/SAMBA_4_0/source/param/util.c 2006-04-04 15:37:30 UTC (rev 14908) +++ branches/SAMBA_4_0/source/param/util.c 2006-04-04 16:20:32 UTC (rev 14909) @@ -170,7 +170,7 @@ static char *modules_path(TALLOC_CTX* mem_ctx, const char *name) { - return talloc_asprintf(mem_ctx, "%s/%s", dyn_MODULESDIR, name); + return talloc_asprintf(mem_ctx, "%s/%s", lp_modulesdir(), name); } /** @@ -184,6 +184,7 @@ char *path = modules_path(mem_ctx, subsystem); init_module_fn *ret; + printf("MODULESDIR: %s\n", path); ret = load_modules(mem_ctx, path); talloc_free(path);