r19539: Move pidfile to smbd/

(This used to be commit eefa64cbe392c4c4dcbf71b8bcf5128cce0339ba)

diff --git a/source4/lib/util/config.mk b/source4/lib/util/config.mk
index 5e49eb839ac01eb0ac1574eab6f64a35310d03f5..5d3e2cc4cacacf6af8918f9e4d3bf32c1081ded8 100644 (file)
--- 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 918288f0fe9821461c70f5a895b496e955c10359..061893d5a170b2a79f8828e9ecdd7c2f01b0a214 100644 (file)
--- 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
similarity index 96%
rename from source4/lib/util/pidfile.c
rename to source4/smbd/pidfile.c
index dc9ecafae928e8aa5da28dc66fd8e84c86401494..493de66b442dcd09a7fdef056b6760dde8b35ddc 100644 (file)
--- 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 cf0efc65223c3bf79dde47ae99e0a85f23719425..2239f33d179faaf9ca5bcf4f239a2c552995b0b2 100644 (file)
--- 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