diff options
author | Nadezhda Ivanova <nadezhda.ivanova@postpath.com> | 2009-09-20 17:43:46 -0700 |
---|---|---|
committer | Nadezhda Ivanova <nadezhda.ivanova@postpath.com> | 2009-09-20 17:43:46 -0700 |
commit | 025590e7a4758e86e7942642971b92fc6bab7a8e (patch) | |
tree | e48bb903f2aabf1707825c84cc3d9ff517eed125 /source4/smbd | |
parent | 6283f2caaa42c7238bdc9c2e8bc1246207645019 (diff) | |
parent | 11bfbc516077d1cead94d0bc70ef24267b9014e7 (diff) | |
download | samba-025590e7a4758e86e7942642971b92fc6bab7a8e.tar.gz samba-025590e7a4758e86e7942642971b92fc6bab7a8e.tar.bz2 samba-025590e7a4758e86e7942642971b92fc6bab7a8e.zip |
Merge branch 'master' of git://git.samba.org/samba
Diffstat (limited to 'source4/smbd')
-rw-r--r-- | source4/smbd/server.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/smbd/server.c b/source4/smbd/server.c index a96991e646..8aad26dd2c 100644 --- a/source4/smbd/server.c +++ b/source4/smbd/server.c @@ -407,6 +407,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, cmdline_lp_ctx, model, lp_server_services(cmdline_lp_ctx)); if (!NT_STATUS_IS_OK(status)) { @@ -425,7 +426,7 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[ return 0; } - int main(int argc, const char *argv[]) +int main(int argc, const char *argv[]) { return binary_smbd_main("samba", argc, argv); } |