From: fendo Date: Mon, 16 Sep 2013 22:04:00 +0000 (+0200) Subject: Fix: compiling Warning, dpkg-buildflags ... X-Git-Tag: 2.2.1-2fdn3.11~3 X-Git-Url: http://git.sameswireless.fr/l2tpns.git/commitdiff_plain/f4e05b93e06de6392be0d5d394914cd7e37207fc?ds=sidebyside;hp=-c Fix: compiling Warning, dpkg-buildflags ... --- f4e05b93e06de6392be0d5d394914cd7e37207fc diff --git a/Makefile b/Makefile index 29799e4..fb12741 100644 --- a/Makefile +++ b/Makefile @@ -10,14 +10,16 @@ DEFINES = DEFINES += -DLIBDIR='"$(libdir)"' DEFINES += -DETCDIR='"$(etcdir)"' -DEB_CFLAGS_MAINT_APPEND=-Wall -O3 -Wno-format-zero-length +OPTIM = +OPTIM += -g +OPTIM += -O3 CC = gcc LD = gcc INCLUDES = -I. -CPPFLAGS = `dpkg-buildflags --get CPPFLAGS` $(INCLUDES) $(DEFINES) -CFLAGS = `dpkg-buildflags --get CFLAGS` -LDFLAGS = `dpkg-buildflags --get LDFLAGS` +CPPFLAGS = $(INCLUDES) $(DEFINES) +CFLAGS = -Wall -Wformat-security $(OPTIM) +LDFLAGS = LDLIBS = INSTALL = install -c -D -o root -g root diff --git a/garden.c b/garden.c index ea5bb99..0795196 100644 --- a/garden.c +++ b/garden.c @@ -157,7 +157,7 @@ int plugin_become_master(void) for (i = 0; up_commands[i] && *up_commands[i]; i++) { f->log(3, 0, 0, "Running %s\n", up_commands[i]); - int status = system(up_commands[i]); + if (-1 == system(up_commands[i])) f->log(0, 0, 0, "error command %s\n", up_commands[i]); } return PLUGIN_RET_OK; @@ -273,7 +273,7 @@ int plugin_init(struct pluginfuncs *funcs) for (i = 0; down_commands[i] && *down_commands[i]; i++) { f->log(3, 0, 0, "Running %s\n", down_commands[i]); - int status = system(down_commands[i]); + if (-1 == system(down_commands[i])) f->log(0, 0, 0, "error command %s\n", down_commands[i]); } } @@ -290,7 +290,7 @@ void plugin_done() for (i = 0; down_commands[i] && *down_commands[i]; i++) { f->log(3, 0, 0, "Running %s\n", down_commands[i]); - int status = system(down_commands[i]); + if (-1 == system(down_commands[i])) f->log(0, 0, 0, "error command %s\n", down_commands[i]); } } diff --git a/l2tpns.c b/l2tpns.c index 63d110d..57ede3d 100644 --- a/l2tpns.c +++ b/l2tpns.c @@ -5050,9 +5050,9 @@ int main(int argc, char *argv[]) case 'd': if (fork()) exit(0); setsid(); - FILE *in = freopen("/dev/null", "r", stdin); - FILE *out = freopen("/dev/null", "w", stdout); - FILE *err = freopen("/dev/null", "w", stderr); + if(!freopen("/dev/null", "r", stdin)) LOG(0, 0, 0, "Error freopen stdin: %s\n", strerror(errno)); + if(!freopen("/dev/null", "w", stdout)) LOG(0, 0, 0, "Error freopen stdout: %s\n", strerror(errno)); + if(!freopen("/dev/null", "w", stderr)) LOG(0, 0, 0, "Error freopen stderr: %s\n", strerror(errno)); break; case 'v': optdebug++; @@ -5103,7 +5103,7 @@ int main(int argc, char *argv[]) LOG(0, 0, 0, "Can't set ulimit: %s\n", strerror(errno)); // Make core dumps go to /tmp - int ret = chdir("/tmp"); + if(chdir("/tmp")) LOG(0, 0, 0, "Error chdir /tmp: %s\n", strerror(errno)); } if (config->scheduler_fifo)