X-Git-Url: https://git.distorted.org.uk/~mdw/secnet/blobdiff_plain/b7886fd46ab05c97b8a072e497903622bd1d5290..refs/heads/master:/secnet.c

diff --git a/secnet.c b/secnet.c
index 7aaaef5..c14a835 100644
--- a/secnet.c
+++ b/secnet.c
@@ -1,3 +1,22 @@
+/*
+ * This file is part of secnet.
+ * See README for full list of copyright holders.
+ *
+ * secnet is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * secnet is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * version 3 along with secnet; if not, see
+ * https://www.gnu.org/licenses/gpl.html.
+ */
+
 #include "secnet.h"
 #include <stdio.h>
 #include <assert.h>
@@ -108,6 +127,9 @@ static void parse_options(int argc, char **argv)
 	    exit(0);
 	    break;
 
+	case 'd':
+	    message_level|=M_DEBUG_CONFIG|M_DEBUG_PHASE|M_DEBUG;
+	    /* fall through */
 	case 'v':
 	    message_level|=M_INFO|M_NOTICE|M_WARNING|M_ERR|M_SECURITY|
 		M_FATAL;
@@ -117,10 +139,6 @@ static void parse_options(int argc, char **argv)
 	    message_level&=(~M_WARNING);
 	    break;
 
-	case 'd':
-	    message_level|=M_DEBUG_CONFIG|M_DEBUG_PHASE|M_DEBUG;
-	    break;
-
 	case 'f':
 	    message_level=M_FATAL;
 	    break;
@@ -331,7 +349,7 @@ static void run(void)
 	if (shortfall) {
 	    allocdfds *= 2;
 	    allocdfds += shortfall;
-	    fds=safe_realloc_ary(fds,sizeof(*fds),allocdfds, "run");
+	    REALLOC_ARY(fds,allocdfds);
 	}
 	shortfall=0;
 	idx=0;