diff options
| author | Jeremy Allison <jra@samba.org> | 2008-12-18 15:40:05 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2008-12-18 15:40:05 -0800 |
| commit | 4283ae489b6e227beba196e8a315a9727f03cc07 (patch) | |
| tree | 7308561653b9e52eab8fc13181c0ad41ae2da208 /source4/smbd | |
| parent | f9bb8fbe832409893b17f2113d7b35b9ffe91540 (diff) | |
| parent | d031472227b44d040698e6dff52dc79028fde854 (diff) | |
| download | samba-4283ae489b6e227beba196e8a315a9727f03cc07.tar.gz samba-4283ae489b6e227beba196e8a315a9727f03cc07.tar.bz2 samba-4283ae489b6e227beba196e8a315a9727f03cc07.zip | |
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
Diffstat (limited to 'source4/smbd')
| -rw-r--r-- | source4/smbd/config.mk | 2 | ||||
| -rw-r--r-- | source4/smbd/process_model.mk | 3 | ||||
| -rw-r--r-- | source4/smbd/service_named_pipe.c | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk index 63105d368c..a5f5aab65e 100644 --- a/source4/smbd/config.mk +++ b/source4/smbd/config.mk @@ -2,7 +2,7 @@ [SUBSYSTEM::service] PRIVATE_DEPENDENCIES = \ - MESSAGING samba-socket NDR_NAMED_PIPE_AUTH + LIBEVENTS MESSAGING samba-socket NDR_NAMED_PIPE_AUTH service_OBJ_FILES = $(addprefix $(smbdsrcdir)/, \ service.o \ diff --git a/source4/smbd/process_model.mk b/source4/smbd/process_model.mk index 5ed8471a9d..d2ef048f40 100644 --- a/source4/smbd/process_model.mk +++ b/source4/smbd/process_model.mk @@ -15,7 +15,7 @@ process_model_single_OBJ_FILES = $(smbdsrcdir)/process_single.o [MODULE::process_model_standard] INIT_FUNCTION = process_model_standard_init SUBSYSTEM = process_model -PRIVATE_DEPENDENCIES = SETPROCTITLE +PRIVATE_DEPENDENCIES = LIBEVENTS SETPROCTITLE # End MODULE process_model_standard ################################################ @@ -37,6 +37,7 @@ process_model_thread_OBJ_FILES = $(smbdsrcdir)/process_thread.o [MODULE::process_model_prefork] INIT_FUNCTION = process_model_prefork_init SUBSYSTEM = process_model +PRIVATE_DEPENDENCIES = LIBEVENTS SETPROCTITLE # End MODULE process_model_thread ################################################ diff --git a/source4/smbd/service_named_pipe.c b/source4/smbd/service_named_pipe.c index b2b102c01f..ad7ba76b0d 100644 --- a/source4/smbd/service_named_pipe.c +++ b/source4/smbd/service_named_pipe.c @@ -20,6 +20,7 @@ */ #include "includes.h" +#include "lib/events/events.h" #include "lib/socket/socket.h" #include "smbd/service.h" #include "param/param.h" |