Source-Changes-HG archive

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

[src/trunk]: src/libexec/httpd make -t chroot option available always again.



details:   https://anonhg.NetBSD.org/src/rev/84af27def3b0
branches:  trunk
changeset: 797376:84af27def3b0
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Jul 16 07:41:43 2014 +0000

description:
make -t chroot option available always again.

diffstat:

 libexec/httpd/main.c |  11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diffs (34 lines):

diff -r b20eb0684905 -r 84af27def3b0 libexec/httpd/main.c
--- a/libexec/httpd/main.c      Wed Jul 16 03:17:26 2014 +0000
+++ b/libexec/httpd/main.c      Wed Jul 16 07:41:43 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.7 2014/01/02 08:21:38 mrg Exp $     */
+/*     $NetBSD: main.c,v 1.8 2014/07/16 07:41:43 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       */
@@ -290,9 +290,12 @@
 #endif /* NO_DEBUG */
                        break;
 
+               case 't':
+                       bozo_set_pref(&prefs, "chroot dir", optarg);
+                       break;
+
 #ifdef NO_USER_SUPPORT
                case 'p':
-               case 't':
                case 'u':
                        bozo_err(&httpd, 1, "User support is not enabled");
                        /* NOTREACHED */
@@ -301,10 +304,6 @@
                        bozo_set_pref(&prefs, "public_html", optarg);
                        break;
 
-               case 't':
-                       bozo_set_pref(&prefs, "chroot dir", optarg);
-                       break;
-
                case 'u':
                        bozo_set_pref(&prefs, "enable users", "true");
                        break;



Home | Main Index | Thread Index | Old Index