Module Name: src
Committed By: mrg
Date: Sat Nov 24 02:30:56 UTC 2018
Modified Files:
src/libexec/httpd: main.c
Log Message:
fix a bug in the rework for -i option: move the real code in place.
for some reason gcc does not warn about this:
case 'x':
stuff_here();
break;
other_stuff_here();
break;
and the other_stuff_here() was what was mis-placed.
should fix atf failures in networking.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/libexec/httpd/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/httpd/main.c
diff -u src/libexec/httpd/main.c:1.20 src/libexec/httpd/main.c:1.21
--- src/libexec/httpd/main.c:1.20 Thu Nov 22 18:21:59 2018
+++ src/libexec/httpd/main.c Sat Nov 24 02:30:56 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.20 2018/11/22 18:21:59 mrg Exp $ */
+/* $NetBSD: main.c,v 1.21 2018/11/24 02:30:56 mrg Exp $ */
/* $eterna: main.c,v 1.6 2011/11/18 09:21:15 mrg Exp $ */
/* from: eterna: bozohttpd.c,v 1.159 2009/05/23 02:14:30 mrg Exp */
@@ -253,6 +253,9 @@ main(int argc, char **argv)
if (!have_daemon_mode)
goto no_daemon_mode;
+ bozo_set_pref(&httpd, &prefs, "bind address", optarg);
+ break;
+
case 'L':
if (!have_lua)
bozoerr(&httpd, 1, "Lua support not enabled");
@@ -371,9 +374,6 @@ main(int argc, char **argv)
bozo_ssl_set_ciphers(&httpd, optarg);
break;
- bozo_set_pref(&httpd, &prefs, "bind address", optarg);
- break;
-
default:
usage(&httpd, progname);
/* NOTREACHED */
