diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2008-05-12 09:44:27 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2008-05-12 09:44:27 +1000 |
| commit | b869a525b1f40baf881a725e5632b39c99268d67 (patch) | |
| tree | 594e53b6f5ad26e28ad8fe78d9119275e4ac319d /source4/smbd | |
| parent | 00ebe3df811a9eb7737fa6278d8784500c35bd14 (diff) | |
| parent | 5d02514f72c6c89bc28b4c5de3d95bb8a439b56e (diff) | |
| download | samba-b869a525b1f40baf881a725e5632b39c99268d67.tar.gz samba-b869a525b1f40baf881a725e5632b39c99268d67.tar.bz2 samba-b869a525b1f40baf881a725e5632b39c99268d67.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 61c31dc7cf649bc6f2d14bc8637e50ead9b9210a)
Diffstat (limited to 'source4/smbd')
| -rw-r--r-- | source4/smbd/process_model.c | 1 | ||||
| -rw-r--r-- | source4/smbd/server.c | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/source4/smbd/process_model.c b/source4/smbd/process_model.c index 2cb551a520..e631975b37 100644 --- a/source4/smbd/process_model.c +++ b/source4/smbd/process_model.c @@ -20,7 +20,6 @@ #include "includes.h" #include "smbd/process_model.h" -#include "build.h" #include "param/param.h" /* diff --git a/source4/smbd/server.c b/source4/smbd/server.c index 3f6cb48013..e1ebd133ce 100644 --- a/source4/smbd/server.c +++ b/source4/smbd/server.c @@ -28,7 +28,6 @@ #include "lib/cmdline/popt_common.h" #include "system/dir.h" #include "system/filesys.h" -#include "build.h" #include "ldb/include/ldb.h" #include "registry/registry.h" #include "ntvfs/ntvfs.h" @@ -199,7 +198,7 @@ static int binary_smbd_main(const char *binary_name, int argc, const char *argv[ extern NTSTATUS server_service_smb_init(void); extern NTSTATUS server_service_drepl_init(void); extern NTSTATUS server_service_rpc_init(void); - init_module_fn static_init[] = { STATIC_service_MODULES }; + init_module_fn static_init[] = { STATIC_smbd_MODULES }; init_module_fn *shared_init; struct event_context *event_ctx; NTSTATUS status; |