Commit Diff
Diff:
aee86fc355ddfe18274a46ac731a4ba673c9dbd9
584b25b211c6396742cf77e126ff1341217629f7
Commit:
584b25b211c6396742cf77e126ff1341217629f7
Tree:
5bb15d76bc5d6b31670af0b5246825539d8491ae
Author:
pjp <pjp@delphinusdns.org>
Committer:
pjp <pjp@delphinusdns.org>
Date:
Mon Nov 18 18:46:01 2019 UTC
Message:
this should make FreeBSD compile
blob - 7cfe1dc88dbe1f779d35ad6085758b88194c80bc
blob + a9a6728b7a0cd431aa6191b64b38c829e7b13245
--- dddctl/Makefile.freebsd
+++ dddctl/Makefile.freebsd
@@ -2,7 +2,7 @@
PROG=dddctl
-SRCS=dddctl.c parse.y base64.c dnssec.c util.c ent.c db.c raxfr.c tsig.c region.c
+SRCS=dddctl.c parse.y base64.c dnssec.c util.c ent.c db.c raxfr.c tsig.c region.c imsg-buffer.c imsg.c
CFLAGS= -Wall -g -I${.CURDIR}/..
LDFLAGS= -Wall -g
blob - 74f1177637434d652375a36742b3bd24e27e338e
blob + f5aeecfb0c92ba6883bb0fd3cca39c6e6895f700
--- parse.y
+++ parse.y
@@ -21,7 +21,7 @@
*/
/*
- * $Id: parse.y,v 1.87 2019/11/18 15:53:49 pjp Exp $
+ * $Id: parse.y,v 1.88 2019/11/18 18:46:01 pjp Exp $
*/
%{
@@ -3912,10 +3912,12 @@ drop_privs(char *chrootpath, struct passwd *pw)
return -1;
}
+#if __OpenBSD__
if (unveil("/", "rwc") < 0) {
dolog(LOG_INFO, "unveil: %s\n", strerror(errno));
return -1;
}
+#endif
if (chdir("/") < 0) {
dolog(LOG_INFO, "chdir: %s\n", strerror(errno));
blob - ed41307d89bf1cc94c786373c3db14437f9f979c
blob + ee876e20ac14ebda3f384884193145d41f00ee2b
--- raxfr.c
+++ raxfr.c
@@ -26,7 +26,7 @@
*
*/
/*
- * $Id: raxfr.c,v 1.33 2019/11/18 15:49:45 pjp Exp $
+ * $Id: raxfr.c,v 1.34 2019/11/18 18:46:01 pjp Exp $
*/
#include <sys/types.h>
@@ -65,6 +65,7 @@
#include <sys/tree.h>
#ifdef __FreeBSD__
#include "imsg.h"
+#include "endian.h"
#else
#include <imsg.h>
#endif /* __FreeBSD__ */
repomaster@centroid.eu