- Fix #4: setusercontext() is in libutil on NetBSD, and also

include login_cap.h only if it exists. git-svn-id: file:///svn/nsd/trunk@4967 a26ef69c-88ff-0310-839f-98b793d9c207
NLnetLabs · Feb 14, 2019 · 7871b2f · 7871b2f
1 parent 23caa9c
commit 7871b2f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/configure.ac b/configure.ac
@@ -627,6 +627,7 @@ AC_SYS_LARGEFILE
 AC_CHECK_SIZEOF(void*)
 AC_CHECK_SIZEOF(off_t)
 AC_CHECK_FUNCS([arc4random arc4random_uniform])
+AC_SEARCH_LIBS([setusercontext],[util],[AC_CHECK_HEADERS([login_cap.h])])
 AC_CHECK_FUNCS([tzset alarm chroot dup2 endpwent gethostname memset memcpy pwrite socket strcasecmp strchr strdup strerror strncasecmp strtol writev getaddrinfo getnameinfo freeaddrinfo gai_strerror sigaction sigprocmask strptime strftime localtime_r setusercontext glob initgroups setresuid setreuid setresgid setregid getpwnam mmap ppoll clock_gettime accept4])
 
 AC_ARG_ENABLE(recvmmsg, AC_HELP_STRING([--enable-recvmmsg], [Enable recvmmsg and sendmmsg compilation, faster but some kernel versions may have implementation problems for IPv6]))

diff --git a/doc/ChangeLog b/doc/ChangeLog
@@ -1,3 +1,7 @@
+14 February 2019: Wouter
+	- Fix #4: setusercontext() is in libutil on NetBSD, and also
+	  include login_cap.h only if it exists.
+
 1 February 2019: Wouter
 	- Fix for tsig assoc_tsig command on acl with nokey elements.
 

diff --git a/nsd.c b/nsd.c
@@ -21,7 +21,9 @@
 #include <grp.h>
 #endif /* HAVE_GRP_H */
 #ifdef HAVE_SETUSERCONTEXT
+#ifdef HAVE_LOGIN_CAP_H
 #include <login_cap.h>
+#endif
 #endif /* HAVE_SETUSERCONTEXT */
 
 #include <assert.h>