diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-11-03 01:49:19 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:24:46 -0500 |
| commit | 1b4b2a291d9a8e2ad2fa0771e7386a3f6d89512d (patch) | |
| tree | 84cf373ccfd388f1326761b4afc331befa72dfe6 | |
| parent | 06d9c68658bc9bebb6d48663cc013fdf6ad472d8 (diff) | |
| download | samba-1b4b2a291d9a8e2ad2fa0771e7386a3f6d89512d.tar.gz samba-1b4b2a291d9a8e2ad2fa0771e7386a3f6d89512d.tar.bz2 samba-1b4b2a291d9a8e2ad2fa0771e7386a3f6d89512d.zip | |
r19539: Move pidfile to smbd/
(This used to be commit eefa64cbe392c4c4dcbf71b8bcf5128cce0339ba)
| -rw-r--r-- | source4/lib/util/config.mk | 6 | ||||
| -rw-r--r-- | source4/smbd/config.mk | 6 | ||||
| -rw-r--r-- | source4/smbd/pidfile.c (renamed from source4/lib/util/pidfile.c) | 6 | ||||
| -rw-r--r-- | source4/smbd/server.c | 2 |
4 files changed, 8 insertions, 12 deletions
diff --git a/source4/lib/util/config.mk b/source4/lib/util/config.mk index 5e49eb839a..5d3e2cc4ca 100644 --- a/source4/lib/util/config.mk +++ b/source4/lib/util/config.mk @@ -28,13 +28,9 @@ OBJ_FILES = xfile.o \ idtree.o \ module.o PUBLIC_DEPENDENCIES = \ - LIBCRYPTO LIBTALLOC \ + LIBTALLOC LIBCRYPTO \ SOCKET_WRAPPER EXT_NSL -[SUBSYSTEM::PIDFILE] -PRIVATE_PROTO_HEADER = pidfile.h -OBJ_FILES = pidfile.o - [SUBSYSTEM::UNIX_PRIVS] PRIVATE_PROTO_HEADER = unix_privs.h OBJ_FILES = unix_privs.o diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk index 918288f0fe..061893d5a1 100644 --- a/source4/smbd/config.mk +++ b/source4/smbd/config.mk @@ -23,6 +23,10 @@ PUBLIC_DEPENDENCIES = \ # End SUBSYSTEM SERVER ####################### +[SUBSYSTEM::PIDFILE] +OBJ_FILES = pidfile.o +PUBLIC_PROTO_HEADER = pidfile.h + ################################# # Start BINARY smbd [BINARY::smbd] @@ -35,8 +39,8 @@ PRIVATE_DEPENDENCIES = \ service \ LIBSAMBA-CONFIG \ LIBSAMBA-UTIL \ - PIDFILE \ POPT_SAMBA \ + PIDFILE \ LIBPOPT \ gensec \ registry \ diff --git a/source4/lib/util/pidfile.c b/source4/smbd/pidfile.c index dc9ecafae9..493de66b44 100644 --- a/source4/lib/util/pidfile.c +++ b/source4/smbd/pidfile.c @@ -23,10 +23,6 @@ #include "includes.h" #include "system/filesys.h" -#ifndef O_NONBLOCK -#define O_NONBLOCK -#endif - /** * @file * @brief Pid file handling @@ -36,7 +32,7 @@ * return the pid in a pidfile. return 0 if the process (or pidfile) * does not exist */ -_PUBLIC_ pid_t pidfile_pid(const char *name) +pid_t pidfile_pid(const char *name) { int fd; char pidstr[20]; diff --git a/source4/smbd/server.c b/source4/smbd/server.c index cf0efc6522..2239f33d17 100644 --- a/source4/smbd/server.c +++ b/source4/smbd/server.c @@ -38,7 +38,7 @@ #include "smbd/process_model.h" #include "smbd/service.h" #include "passdb/secrets.h" -#include "lib/util/pidfile.h" +#include "smbd/pidfile.h" /* recursively delete a directory tree |