Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/libexec/httpd fix a bug in the rework for -i option: move t...



details:   https://anonhg.NetBSD.org/src/rev/644aadc03c59
branches:  trunk
changeset: 446109:644aadc03c59
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Nov 24 02:30:56 2018 +0000

description:
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.

diffstat:

 libexec/httpd/main.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r 45173bb698cd -r 644aadc03c59 libexec/httpd/main.c
--- a/libexec/httpd/main.c      Sat Nov 24 01:04:18 2018 +0000
+++ b/libexec/httpd/main.c      Sat Nov 24 02:30:56 2018 +0000
@@ -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 @@
                        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 @@
                        bozo_ssl_set_ciphers(&httpd, optarg);
                        break;
 
-                       bozo_set_pref(&httpd, &prefs, "bind address", optarg);
-                       break;
-
                default:
                        usage(&httpd, progname);
                        /* NOTREACHED */



Home | Main Index | Thread Index | Old Index