6:31 p.m.
Makefile.am | 10 ++++-----
configure.ac | 15 ++++++++++++-
include/base/systems.h | 26 +++++++++++++++++++++++
include/public/base/systems.h | 9 ++++++++
ldap/include/portable.h | 8 +++----
ldap/servers/slapd/log.c | 2 -
ldap/servers/slapd/tools/ldclt/ldclt.h | 5 ++++
ldap/systools/idsktune.c | 4 +++
lib/base/crit.cpp | 36 ++++++++++++++++-----------------
lib/base/dnsdmain.cpp | 2 -
lib/base/file.cpp | 2 -
lib/ldaputil/cert.c | 4 ++-
lib/ldaputil/certmap.c | 4 ++-
lib/ldaputil/dbconf.c | 4 ++-
lib/ldaputil/encode.c | 4 ++-
15 files changed, 100 insertions(+), 35 deletions(-)
New commits:
commit 251424ef23522b716269059083b3377cbbd42d72
Author: William Brown <wibrown(a)redhat.com>
Date: Thu May 12 16:14:44 2016 +1000
Ticket 48797 - Add freebsd support to ns-slapd: Configure and makefile.
Description: Fix the configure file and make file to support FreeBSD specifics
https://fedorahosted.org/389/ticket/48797
Author: wibrown
Reviewed by: lslebodn (Thanks!)
diff --git a/Makefile.am b/Makefile.am
index 546f89e..1d76aeb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -61,7 +61,7 @@ AM_LDFLAGS = -lpthread
else
#AM_LDFLAGS = -Wl,-z,defs
AM_LDFLAGS = $(ASAN_DEFINES)
-endif
+endif #end hpux
#------------------------
# Linker Flags
@@ -89,7 +89,7 @@ PCRE_LINK = @pcre_lib@ -lpcre
NETSNMP_LINK = @netsnmp_lib@ @netsnmp_link@
PAM_LINK = -lpam
KERBEROS_LINK = $(kerberos_lib)
-DLOPEN_LINK = -ldl
+
SYSTEMD_LINK = @systemd_lib@
@@ -1751,7 +1751,7 @@ ns_slapd_SOURCES = ldap/servers/slapd/abandon.c \
ns_slapd_CPPFLAGS = $(AM_CPPFLAGS) @sasl_inc@ @openldap_inc@ @ldapsdk_inc@ @nss_inc@ \
@nspr_inc@ @svrcore_inc@ @systemd_inc@
-ns_slapd_LDADD = libslapd.la libldaputil.a $(LDAPSDK_LINK) $(NSS_LINK) $(DLOPEN_LINK) \
+ns_slapd_LDADD = libslapd.la libldaputil.a $(LDAPSDK_LINK) $(NSS_LINK) $(LIBADD_DL) \
$(NSPR_LINK) $(SASL_LINK) $(SVRCORE_LINK) $(LIBNSL) $(LIBSOCKET) $(THREADLIB)
$(SYSTEMD_LINK)
# We need to link ns-slapd with the C++ compiler on HP-UX since we load
# some C++ shared libraries (such as icu).
@@ -1946,7 +1946,7 @@ endif
if SYSTEMD
$(fixupcmd) $^ | sed -e 's/@preamble@/# This file is in systemd EnvironmentFile
format - see man systemd.exec/' > $@
else
- $(fixupcmd) $^ | sed -n -e 's/@preamble@//' -e '/^#/{p;d}' -e
'/^$$/{p;d}' -e 's/^\([^=]*\)\(=.*\)$$/\1\2 ; export \1/ ; p' > $@
+ $(fixupcmd) $^ | sed -n -e 's/@preamble@//' -e '/^#/{p;d;}' -e
'/^$$/{p;d;}' -e 's/^\([^=]*\)\(=.*\)$$/\1\2 ; export \1/ ; p' > $@
$(fixupcmd) $(srcdir)/ldap/admin/src/initconfig.in >> $@
endif
@@ -1955,7 +1955,7 @@ endif
if SYSTEMD
$(fixupcmd) $^ | sed -e 's/@preamble@/# This file is in systemd EnvironmentFile
format - see man systemd.exec/' > $@
else
- $(fixupcmd) $^ | sed -n -e 's/@preamble@//' -e '/^#/{p;d}' -e
'/^$$/{p;d}' -e 's/^\([^=]*\)\(=.*\)$$/\1\2 ; export \1/ ; p' > $@
+ $(fixupcmd) $^ | sed -n -e 's/@preamble@//' -e '/^#/{p;d;}' -e
'/^$$/{p;d;}' -e 's/^\([^=]*\)\(=.*\)$$/\1\2 ; export \1/ ; p' > $@
endif
%/$(PACKAGE_NAME).pc: %/dirsrv.pc.in
diff --git a/configure.ac b/configure.ac
index 327452f..57b5b29 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,7 +39,7 @@ AC_PROG_LIBTOOL
AC_HEADER_DIRENT
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS([arpa/inet.h fcntl.h malloc.h netdb.h netinet/in.h stdlib.h string.h
strings.h sys/file.h sys/socket.h sys/time.h unistd.h inttypes.h mntent.h])
+AC_CHECK_HEADERS([arpa/inet.h fcntl.h malloc.h netdb.h netinet/in.h stdlib.h string.h
strings.h sys/file.h sys/socket.h sys/time.h unistd.h inttypes.h mntent.h sys/sysinfo.h])
# Checks for typedefs, structures, and compiler characteristics.
AC_HEADER_STAT
@@ -68,6 +68,9 @@ AC_FUNC_STRFTIME
AC_FUNC_VPRINTF
AC_CHECK_FUNCS([clock_gettime endpwent ftruncate getcwd gethostbyname inet_ntoa
localtime_r memmove memset mkdir munmap putenv rmdir setrlimit socket strcasecmp strchr
strcspn strdup strerror strncasecmp strpbrk strrchr strstr strtol tzset])
+# This will detect if we need to add the LIBADD_DL value for us.
+LT_LIB_DLLOAD
+
AC_MSG_CHECKING(for --enable-debug)
AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug], [Enable debug features (default:
no)]),
[
@@ -550,6 +553,15 @@ case $host in
AC_SUBST([LIBCRYPT], [$LIBCRYPT])
AC_DEFINE([USE_POSIX_RWLOCKS], [1], [POSIX rwlocks])
;;
+ *-*-freebsd*)
+ AC_DEFINE([FREEBSD], [1], [FreeBSD])
+ platform="freebsd"
+ initdir='$(sysconfdir)/rc.d'
+ THREADLIB=-lthr
+ AC_SUBST([THREADLIB], [$THREADLIB])
+ AC_DEFINE([USE_POSIX_RWLOCKS], [1], [POSIX rwlocks])
+ LIBDL=
+ ;;
ia64-hp-hpux*)
AC_DEFINE([hpux], [1], [HP-UX])
AC_DEFINE([HPUX], [1], [HP-UX])
@@ -654,6 +666,7 @@ AC_SUBST(initconfigdir)
AM_CONDITIONAL([HPUX],[test "$platform" = "hpux"])
AM_CONDITIONAL([SOLARIS],[test "$platform" = "solaris"])
+AM_CONDITIONAL([FREEBSD],[test "$platform" = "freebsd"])
# Check for library dependencies
m4_include(m4/nspr.m4)
commit 97897530358104868bac4c04d79fbd2407a49390
Author: William Brown <wibrown(a)redhat.com>
Date: Thu May 12 16:49:33 2016 +1000
Ticket 48797 - Add freebsd support to ns-slapd: Add freebsd support for ldaputil
Description: Add freebsd support to the various components of the ldaputil
https://fedorahosted.org/389/ticket/48797
Author: wibrown
Reviewed by: lslebodn (Thanks!)
diff --git a/lib/ldaputil/cert.c b/lib/ldaputil/cert.c
index dfe77c6..aca4f98 100644
--- a/lib/ldaputil/cert.c
+++ b/lib/ldaputil/cert.c
@@ -13,7 +13,9 @@
#include <string.h>
-#include <malloc.h>
+/* This was malloc.h - but it's moved to stdlib.h on most platforms, and FBSD is
strict */
+/* Make it stdlib.h, and revert to malloc.h with ifdefs if we have issues here. WB 2016
*/
+#include <stdlib.h>
/* removed for ns security integration
#include <sec.h>
diff --git a/lib/ldaputil/certmap.c b/lib/ldaputil/certmap.c
index 8525f51..5f28b8c 100644
--- a/lib/ldaputil/certmap.c
+++ b/lib/ldaputil/certmap.c
@@ -15,7 +15,9 @@
#include <stdio.h>
#include <string.h>
#include <ctype.h>
-#include <malloc.h>
+/* This was malloc.h - but it's moved to stdlib.h on most platforms, and FBSD is
strict */
+/* Make it stdlib.h, and revert to malloc.h with ifdefs if we have issues here. WB 2016
*/
+#include <stdlib.h>
/* removed for ns security integration
#include <sec.h>
diff --git a/lib/ldaputil/dbconf.c b/lib/ldaputil/dbconf.c
index 048bc56..d5c315b 100644
--- a/lib/ldaputil/dbconf.c
+++ b/lib/ldaputil/dbconf.c
@@ -13,7 +13,9 @@
#include <string.h>
-#include <malloc.h>
+/* This was malloc.h - but it's moved to stdlib.h on most platforms, and FBSD is
strict */
+/* Make it stdlib.h, and revert to malloc.h with ifdefs if we have issues here. WB 2016
*/
+#include <stdlib.h>
#include <ctype.h>
#include <ldaputil/errors.h>
diff --git a/lib/ldaputil/encode.c b/lib/ldaputil/encode.c
index 267d795..eea3edd 100644
--- a/lib/ldaputil/encode.c
+++ b/lib/ldaputil/encode.c
@@ -12,7 +12,9 @@
#endif
-#include <malloc.h>
+/* This was malloc.h - but it's moved to stdlib.h on most platforms, and FBSD is
strict */
+/* Make it stdlib.h, and revert to malloc.h with ifdefs if we have issues here. WB 2016
*/
+#include <stdlib.h>
#include <string.h>
#include <ldaputil/certmap.h>
#include <ldaputil/encode.h>
commit b7cda0d1fda6a06d77fbc35dcffe486f219cf3a3
Author: William Brown <wibrown(a)redhat.com>
Date: Thu May 12 16:48:45 2016 +1000
Ticket 48797 - Add freebsd support to ns-slapd: Add support for dsktune
Description: Add freebsd support to dsktune
https://fedorahosted.org/389/ticket/48797
Author: wibrown
Reviewed by: lslebodn (Thanks!)
diff --git a/ldap/systools/idsktune.c b/ldap/systools/idsktune.c
index 08b7f12..c171c95 100644
--- a/ldap/systools/idsktune.c
+++ b/ldap/systools/idsktune.c
@@ -25,6 +25,10 @@ static char *build_date = "14-JULY-2016";
#define IDDS_SYSV_INCLUDE 1
#endif
+#if defined(__FreeBSD__)
+#define IDDS_BSD_INCLUDE 1
+#endif
+
#include <sys/types.h>
#if !defined(__VMS)
commit 2d53f14e56a8864d417a66bca99c700c5e6b6d41
Author: William Brown <wibrown(a)redhat.com>
Date: Thu May 12 16:45:33 2016 +1000
Ticket 48797 - Add freebsd support to ns-slapd: Add support for cpp in Fbsd
Description: Change the name of some variables to prevent collision in FreeBSD
https://fedorahosted.org/389/ticket/48797
Author: wibrown
Reviewed by: lslebodn (Thanks!)
diff --git a/lib/base/crit.cpp b/lib/base/crit.cpp
index e7daf17..ccc1de4 100644
--- a/lib/base/crit.cpp
+++ b/lib/base/crit.cpp
@@ -42,12 +42,12 @@ typedef struct critical {
PRLock *lock;
PRUint32 count;
PRThread *owner;
-} critical_t;
+} ns_critical_t;
typedef struct condvar {
- critical_t *lock;
+ ns_critical_t *lock;
PRCondVar *cvar;
-} condvar_t;
+} ns_condvar_t;
#endif
/* -------------------------- critical sections --------------------------- */
@@ -57,7 +57,7 @@ typedef struct condvar {
NSAPI_PUBLIC int crit_owner_is_me(CRITICAL id)
{
#ifdef USE_NSPR
- critical_t *crit = (critical_t*)id;
+ ns_critical_t *crit = (ns_critical_t*)id;
return (crit->owner == PR_GetCurrentThread());
#else
@@ -68,7 +68,7 @@ NSAPI_PUBLIC int crit_owner_is_me(CRITICAL id)
NSAPI_PUBLIC CRITICAL crit_init(void)
{
#ifdef USE_NSPR
- critical_t *crit = (critical_t*)PERM_MALLOC(sizeof(critical_t)) ;
+ ns_critical_t *crit = (ns_critical_t*)PERM_MALLOC(sizeof(ns_critical_t)) ;
if (crit) {
if (!(crit->lock = PR_NewLock())) {
@@ -87,7 +87,7 @@ NSAPI_PUBLIC CRITICAL crit_init(void)
NSAPI_PUBLIC void crit_enter(CRITICAL id)
{
#ifdef USE_NSPR
- critical_t *crit = (critical_t*)id;
+ ns_critical_t *crit = (ns_critical_t*)id;
PRThread *me = PR_GetCurrentThread();
if ( crit->owner == me) {
@@ -106,7 +106,7 @@ NSAPI_PUBLIC void crit_enter(CRITICAL id)
NSAPI_PUBLIC void crit_exit(CRITICAL id)
{
#ifdef USE_NSPR
- critical_t *crit = (critical_t*)id;
+ ns_critical_t *crit = (ns_critical_t*)id;
if (crit->owner != PR_GetCurrentThread())
return;
@@ -121,7 +121,7 @@ NSAPI_PUBLIC void crit_exit(CRITICAL id)
NSAPI_PUBLIC void crit_terminate(CRITICAL id)
{
#ifdef USE_NSPR
- critical_t *crit = (critical_t*)id;
+ ns_critical_t *crit = (ns_critical_t*)id;
PR_DestroyLock((PRLock*)crit->lock);
PERM_FREE(crit);
@@ -135,9 +135,9 @@ NSAPI_PUBLIC void crit_terminate(CRITICAL id)
NSAPI_PUBLIC CONDVAR condvar_init(CRITICAL id)
{
#ifdef USE_NSPR
- critical_t *crit = (critical_t*)id;
+ ns_critical_t *crit = (ns_critical_t*)id;
- condvar_t *cvar = (condvar_t*)PERM_MALLOC(sizeof(condvar_t)) ;
+ ns_condvar_t *cvar = (ns_condvar_t*)PERM_MALLOC(sizeof(ns_condvar_t)) ;
if (crit) {
cvar->lock = crit;
@@ -153,7 +153,7 @@ NSAPI_PUBLIC CONDVAR condvar_init(CRITICAL id)
NSAPI_PUBLIC void condvar_wait(CONDVAR _cv)
{
#ifdef USE_NSPR
- condvar_t *cv = (condvar_t *)_cv;
+ ns_condvar_t *cv = (ns_condvar_t *)_cv;
/* Save away recursion count so we can restore it after the wait */
int saveCount = cv->lock->count;
PRThread *saveOwner = cv->lock->owner;
@@ -170,10 +170,10 @@ NSAPI_PUBLIC void condvar_wait(CONDVAR _cv)
}
-NSAPI_PUBLIC void condvar_timed_wait(CONDVAR _cv, long secs)
+NSAPI_PUBLIC void ns_condvar_timed_wait(CONDVAR _cv, long secs)
{
#ifdef USE_NSPR
- condvar_t *cv = (condvar_t *)_cv;
+ ns_condvar_t *cv = (ns_condvar_t *)_cv;
/* Save away recursion count so we can restore it after the wait */
int saveCount = cv->lock->count;
PRThread *saveOwner = cv->lock->owner;
@@ -197,7 +197,7 @@ NSAPI_PUBLIC void condvar_timed_wait(CONDVAR _cv, long secs)
NSAPI_PUBLIC void condvar_notify(CONDVAR _cv)
{
#ifdef USE_NSPR
- condvar_t *cv = (condvar_t *)_cv;
+ ns_condvar_t *cv = (ns_condvar_t *)_cv;
PR_ASSERT(cv->lock->owner == PR_GetCurrentThread());
PR_NotifyCondVar(cv->cvar);
#endif
@@ -206,16 +206,16 @@ NSAPI_PUBLIC void condvar_notify(CONDVAR _cv)
NSAPI_PUBLIC void condvar_notifyAll(CONDVAR _cv)
{
#ifdef USE_NSPR
- condvar_t *cv = (condvar_t *)_cv;
+ ns_condvar_t *cv = (ns_condvar_t *)_cv;
PR_ASSERT(cv->lock->owner == PR_GetCurrentThread());
PR_NotifyAllCondVar(cv->cvar);
#endif
}
-NSAPI_PUBLIC void condvar_terminate(CONDVAR _cv)
+NSAPI_PUBLIC void ns_condvar_terminate(CONDVAR _cv)
{
#ifdef USE_NSPR
- condvar_t *cv = (condvar_t *)_cv;
+ ns_condvar_t *cv = (ns_condvar_t *)_cv;
PR_DestroyCondVar(cv->cvar);
PERM_FREE(cv);
#endif
@@ -297,7 +297,7 @@ cs_terminate(COUNTING_SEMAPHORE csp)
/* usfreesema() */
return;
#else
- condvar_terminate(cs->cv);
+ ns_condvar_terminate(cs->cv);
crit_terminate(cs->cv_lock);
crit_terminate(cs->lock);
PERM_FREE(cs);
diff --git a/lib/base/dnsdmain.cpp b/lib/base/dnsdmain.cpp
index 545f617..0b522ad 100644
--- a/lib/base/dnsdmain.cpp
+++ b/lib/base/dnsdmain.cpp
@@ -40,7 +40,7 @@ extern int getdomainname(char *, size_t);
#else
extern int getdomainname(char *, int);
#endif /* Linux */
-#if defined(HPUX) || defined(Linux) || defined(SOLARIS_GCC)
+#if defined(HPUX) || defined(Linux) || defined(SOLARIS_GCC) || defined(__FreeBSD__)
extern int gethostname (char *name, size_t namelen);
#else
extern int gethostname (char *name, int namelen);
diff --git a/lib/base/file.cpp b/lib/base/file.cpp
index ad4333e..4e3609a 100644
--- a/lib/base/file.cpp
+++ b/lib/base/file.cpp
@@ -213,7 +213,7 @@ NSAPI_PUBLIC int file_notfound(void)
return (errno == ENOENT);
}
-#if !defined(LINUX)
+#if !defined(LINUX) && !defined(__FreeBSD__)
extern char *sys_errlist[];
#endif
commit eb4c74043ccf8be48f7551b3c03bf8ff985469cf
Author: William Brown <wibrown(a)redhat.com>
Date: Thu May 12 16:42:35 2016 +1000
Ticket 48797 - Add freebsd support to ns-slapd: Header files
Description: Add header file support for freeBSD
https://fedorahosted.org/389/ticket/48797
Author: wibrown
Reviewed by: lslebodn (Thanks!)
diff --git a/include/base/systems.h b/include/base/systems.h
index fead5a0..15f10fb 100644
--- a/include/base/systems.h
+++ b/include/base/systems.h
@@ -142,6 +142,32 @@
#define NET_SOCKETS
#define SHMEM_MMAP_FLAGS MAP_SHARED
+#elif defined(__FreeBSD__)
+
+#define ACCELERATOR_CACHE
+#define DNS_CACHE
+#define FILE_INHERIT_FCNTL
+#define DAEMON_UNIX_MOBRULE
+#define BSD_RLIMIT
+#define BSD_SIGNALS
+#define FILE_UNIX_MMAP
+#define FILE_MMAP_FLAGS (MAP_FILE | MAP_SHARED)
+#define SHMEM_UNIX_MMAP
+#define SHMEM_MMAP_FLAGS MAP_SHARED
+#define AUTH_DBM
+#define SEM_FLOCK
+#define DLL_CAPABLE
+#define DLL_DLOPEN
+#define DLL_DLOPEN_FLAGS RTLD_NOW
+#define HAVE_ATEXIT
+#define HAS_STATFS
+#define JAVA_STATIC_LINK
+#undef NEED_CRYPT_PROTO
+#define NET_SOCKETS
+#ifndef NO_DOMAINNAME
+#define NO_DOMAINNAME
+#endif
+
#else
#error "Missing defines in ns/netsite/include/base/systems.h"
#endif
diff --git a/include/public/base/systems.h b/include/public/base/systems.h
index 535a35c..ba36502 100644
--- a/include/public/base/systems.h
+++ b/include/public/base/systems.h
@@ -65,6 +65,15 @@
#define SHMEM_UNIX_MMAP
#define ZERO(ptr,len) memset(ptr,0,len)
+#elif defined(__FreeBSD__)
+
+#define FILE_UNIX
+#define FILE_UNIX_MMAP
+#define MALLOC_POOLS
+#define SEM_FLOCK
+#define SHMEM_UNIX_MMAP
+#define ZERO(ptr,len) memset(ptr,0,len)
+
#else
#error "Missing defines in ns/netsite/include/public/base/systems.h"
#endif
diff --git a/ldap/include/portable.h b/ldap/include/portable.h
index ea164c0..0f454ce 100644
--- a/ldap/include/portable.h
+++ b/ldap/include/portable.h
@@ -124,7 +124,7 @@
* Are sys_errlist and sys_nerr declared in stdio.h?
*/
#ifndef SYSERRLIST_IN_STDIO
-#if defined( freebsd ) || defined(Linux)
+#if defined( __FreeBSD__ ) || defined(Linux)
#define SYSERRLIST_IN_STDIO
#endif
#endif
@@ -250,7 +250,7 @@ int strncasecmp(const char *, const char *, size_t);
defined(UNIXWARE) || defined(SUNOS4) || defined(SNI) || defined(BSDI) || \
defined(NCR) || defined(OSF1) || defined(NEC) || \
( defined(HPUX10) && !defined(_REENTRANT)) || defined(HPUX11) || \
- defined(UnixWare) || defined(LINUX2_0)
+ defined(UnixWare) || defined(LINUX2_0) || defined (__FreeBSD__)
#define GETHOSTBYNAME( n, r, b, l, e ) gethostbyname( n )
#elif defined(AIX)
#define GETHOSTBYNAME_BUF_T struct hostent_data
@@ -282,7 +282,7 @@ typedef char GETHOSTBYADDR_buf_t [BUFSIZ];
#if defined(HPUX9) || defined(LINUX1_2) || defined(SUNOS4) || defined(SNI) || \
- defined(SCOOS) || defined(BSDI) || defined(NCR) || \
+ defined(SCOOS) || defined(BSDI) || defined(NCR) || defined (__FreeBSD__) || \
defined(NEC) || ( defined(HPUX10) && !defined(_REENTRANT))
#define CTIME( c, b, l ) ctime( c )
#elif defined( hpux10 )
@@ -312,7 +312,7 @@ char *strtok_r(char *, const char *, char **);
extern char *strdup();
#endif /* ultrix || nextstep */
-#if defined( sunos4 ) || defined( OSF1 )
+#if defined( sunos4 ) || defined( OSF1 ) || defined (__FreeBSD__)
#define BSD_TIME 1 /* for servers/slapd/log.h */
#endif /* sunos4 || osf */
diff --git a/ldap/servers/slapd/tools/ldclt/ldclt.h
b/ldap/servers/slapd/tools/ldclt/ldclt.h
index b5da93a..e371221 100644
--- a/ldap/servers/slapd/tools/ldclt/ldclt.h
+++ b/ldap/servers/slapd/tools/ldclt/ldclt.h
@@ -172,6 +172,11 @@ dd/mm/yy | Author | Comments
#if defined(USE_OPENLDAP)
#define ABS(x) ((x > 0) ? (x) : (-x))
#endif
+
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+
/*
* Misc constant definitions
*/
commit 5063d0dbb5fdbf8bd749c0e121740579c8e6e346
Author: Lukas Slebodnik <lslebodn(a)redhat.com>
Date: Tue Nov 29 21:41:28 2016 +0000
Ticket 48978 - Fix implicit function declaration
Description: This patch fixes typo in function name
for converting loglevel to sysloglevel
https://fedorahosted.org/389/ticket/48978
Reviewed by: wibrown
make all-am
make[1]: Entering directory '/tmp/ds'
CC ldap/servers/slapd/libslapd_la-log.lo
In file included from ldap/servers/slapd/slap.h:132:0,
from ldap/servers/slapd/log.h:43,
from ldap/servers/slapd/log.c:29:
ldap/servers/slapd/log.c: In function 'slapi_log_error':
ldap/servers/slapd/log.c:2471:36: error: implicit declaration of function
'get_syslog_level' [-Werror=implicit-function-declaration]
rc = sd_journal_printv(get_syslog_level(loglevel), fmt, ap_err);
^
cc1: some warnings being treated as errors
Makefile:8207: recipe for target 'ldap/servers/slapd/libslapd_la-log.lo'
failed
make[1]: *** [ldap/servers/slapd/libslapd_la-log.lo] Error 1
make[1]: Leaving directory '/tmp/ds'
Makefile:3271: recipe for target 'all' failed
make: *** [all] Error 2
sh# git grep -n get_syslog_level
ldap/servers/slapd/log.c:2471: rc =
sd_journal_printv(get_syslog_level(loglevel), fmt, ap_err);
diff --git a/ldap/servers/slapd/log.c b/ldap/servers/slapd/log.c
index 1195c54..2f43a98 100644
--- a/ldap/servers/slapd/log.c
+++ b/ldap/servers/slapd/log.c
@@ -2468,7 +2468,7 @@ slapi_log_error( int loglevel, char *subsystem, char *fmt, ... )
va_start( ap_err, fmt );
/* va_start( ap_file, fmt ); */
/* This isn't handling RC nicely ... */
- rc = sd_journal_printv(get_syslog_level(loglevel), fmt, ap_err);
+ rc = sd_journal_printv(get_syslog_loglevel(loglevel), fmt, ap_err);
/* rc = sd_journal_printv(LOG_ERROR, fmt, ap_file); */
/* va_end(ap_file); */
va_end(ap_err);