From eec497adf57566b588703c586d0600aa13caa90e Mon Sep 17 00:00:00 2001 From: "Nicholas J. Kain" Date: Mon, 10 Mar 2014 19:29:19 -0400 Subject: [PATCH] Fix warnings in ifchd-parse.rl. Just needed function prototypes. --- ndhc/ifchd-parse.h | 34 ++++++++++++++++++++++++++++++++++ ndhc/ifchd-parse.rl | 1 + ndhc/ifchd.c | 3 +-- ndhc/seccomp.c | 1 + 4 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 ndhc/ifchd-parse.h diff --git a/ndhc/ifchd-parse.h b/ndhc/ifchd-parse.h new file mode 100644 index 0000000..092ccb8 --- /dev/null +++ b/ndhc/ifchd-parse.h @@ -0,0 +1,34 @@ +/* ifchd-parse.h - interface change daemon parser + * + * Copyright (c) 2004-2014 Nicholas J. Kain + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * - Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _NJK_NDHC_IFCHD_PARSE_H_ +#define _NJK_NDHC_IFCHD_PARSE_H_ + +extern int execute_buffer(char *newbuf); + +#endif /* _NJK_NDHC_IFCHD_PARSE_H_ */ diff --git a/ndhc/ifchd-parse.rl b/ndhc/ifchd-parse.rl index c9461ab..99074c5 100644 --- a/ndhc/ifchd-parse.rl +++ b/ndhc/ifchd-parse.rl @@ -30,6 +30,7 @@ #include #include +#include "ifchd-parse.h" #include "ifchd.h" #include "log.h" #include "ifch_proto.h" diff --git a/ndhc/ifchd.c b/ndhc/ifchd.c index 7f98141..fac7691 100644 --- a/ndhc/ifchd.c +++ b/ndhc/ifchd.c @@ -51,6 +51,7 @@ #include "pidfile.h" #include "signals.h" #include "ifch_proto.h" +#include "ifchd-parse.h" #include "strl.h" #include "cap.h" #include "io.h" @@ -79,8 +80,6 @@ extern int pToNdhcW; extern char chroot_dir[MAX_PATH_LENGTH]; extern char resolv_conf_d[MAX_PATH_LENGTH]; -extern int execute_buffer(char *newbuf); - static void writeordie(int fd, const char *buf, int len) { if (safe_write(fd, buf, len) == -1) diff --git a/ndhc/seccomp.c b/ndhc/seccomp.c index 968dc0a..dc891a9 100644 --- a/ndhc/seccomp.c +++ b/ndhc/seccomp.c @@ -26,6 +26,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include +#include "seccomp.h" #include "log.h" #include "seccomp-bpf.h"