Browse Source

Fix build on FreeBSD 9.1 and Current. Thanks to Anton Yuzjaninov for testing.

tags/0.5.1
Vsevolod Stakhov 12 years ago
parent
commit
2e615083e4
3 changed files with 7 additions and 0 deletions
  1. 1
    0
      CMakeLists.txt
  2. 2
    0
      config.h.in
  3. 4
    0
      src/util.c

+ 1
- 0
CMakeLists.txt View File

@@ -667,6 +667,7 @@ FIND_LIBRARY(LIBUTIL_LIBRARY NAMES util PATHS PATH_SUFFIXES lib64 lib
IF(LIBUTIL_LIBRARY)
LIST(APPEND CMAKE_REQUIRED_LIBRARIES util)
CHECK_FUNCTION_EXISTS(pidfile_open HAVE_PIDFILE)
CHECK_FUNCTION_EXISTS(pidfile_fileno HAVE_PIDFILE_FILENO)

FIND_FILE(HAVE_LIBUTIL_H NAMES libutil.h PATHS /usr/include
/opt/include

+ 2
- 0
config.h.in View File

@@ -104,6 +104,8 @@

#cmakedefine HAVE_PIDFILE 1

#cmakedefine HAVE_PIDFILE_FILENO 1

#cmakedefine HAVE_SETPROCTITLE 1

#cmakedefine HAVE_GETPAGESIZE 1

+ 4
- 0
src/util.c View File

@@ -408,7 +408,11 @@ write_pid (struct rspamd_main *main)

if (main->is_privilleged) {
/* Force root user as owner of pid file */
#ifdef HAVE_PIDFILE_FILENO
if (fchown (pidfile_fileno (main->pfh), 0, 0) == -1) {
#else
if (fchown (main->pfh->pf_fd, 0, 0) == -1) {
#endif
msg_err ("cannot chown of pidfile %s to 0:0 user", main->cfg->pid_file);
}
}

Loading…
Cancel
Save