diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-09-28 01:17:46 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:07:25 -0500 |
| commit | 37d53832a4623653f706e77985a79d84bd7c6694 (patch) | |
| tree | 265e308027d6641bbdb29a4feddbe86ef8b25fd1 /source4/smbd/server.c | |
| parent | e09226cb35d627affddc08c4a88527184b8ffcf9 (diff) | |
| download | samba-37d53832a4623653f706e77985a79d84bd7c6694.tar.gz samba-37d53832a4623653f706e77985a79d84bd7c6694.tar.bz2 samba-37d53832a4623653f706e77985a79d84bd7c6694.zip | |
r25398: Parse loadparm context to all lp_*() functions.
(This used to be commit 3fcc960839c6e5ca4de2c3c042f12f369ac5f238)
Diffstat (limited to 'source4/smbd/server.c')
| -rw-r--r-- | source4/smbd/server.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/smbd/server.c b/source4/smbd/server.c index 23d996bf2e..7d84ffe812 100644 --- a/source4/smbd/server.c +++ b/source4/smbd/server.c @@ -269,8 +269,8 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[ cleanup_tmp_files(); - if (!directory_exist(lp_lockdir())) { - mkdir(lp_lockdir(), 0755); + if (!directory_exist(lp_lockdir(global_loadparm))) { + mkdir(lp_lockdir(global_loadparm), 0755); } pidfile_create(binary_name); @@ -329,7 +329,7 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[ } DEBUG(0,("%s: using '%s' process model\n", binary_name, model)); - status = server_service_startup(event_ctx, model, lp_server_services()); + status = server_service_startup(event_ctx, model, lp_server_services(global_loadparm)); if (!NT_STATUS_IS_OK(status)) { DEBUG(0,("Starting Services failed - %s\n", nt_errstr(status))); return 1; |