Module Name: src
Committed By: mrg
Date: Wed Jul 16 07:41:43 UTC 2014
Modified Files:
src/libexec/httpd: main.c
Log Message:
make -t chroot option available always again.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 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.7 src/libexec/httpd/main.c:1.8
--- src/libexec/httpd/main.c:1.7 Thu Jan 2 08:21:38 2014
+++ src/libexec/httpd/main.c Wed Jul 16 07:41:43 2014
@@ -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 @@ main(int argc, char **argv)
#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 @@ main(int argc, char **argv)
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;
