r5525 - trunk/varnish-cache/bin/varnishd

phk at varnish-cache.org phk at varnish-cache.org
Tue Nov 9 10:05:27 CET 2010


Author: phk
Date: 2010-11-09 10:05:27 +0100 (Tue, 09 Nov 2010)
New Revision: 5525

Modified:
   trunk/varnish-cache/bin/varnishd/varnishd.c
Log:
Ok, make code and error message somewhat consistent...



Modified: trunk/varnish-cache/bin/varnishd/varnishd.c
===================================================================
--- trunk/varnish-cache/bin/varnishd/varnishd.c	2010-11-09 09:00:32 UTC (rev 5524)
+++ trunk/varnish-cache/bin/varnishd/varnishd.c	2010-11-09 09:05:27 UTC (rev 5525)
@@ -539,7 +539,9 @@
 	if (b_arg != NULL && f_arg != NULL) {
 		fprintf(stderr, "Only one of -b or -f can be specified\n");
 		usage();
-	} else if (S_arg == NULL && T_arg == NULL) {
+	}
+	if (S_arg == NULL && T_arg == NULL && d_flag == 0 && b_arg == NULL &&
+	    f_arg == NULL) {
 		fprintf(stderr,
 		    "At least one of -d, -b, -f, -S or -T must be specified\n");
 		usage();




More information about the varnish-commit mailing list