[master] a36d77c Allow -M without -S

[Poul-Henning Kamp]

commit a36d77c39f5e7c451505ff1d77439afbf5717f84
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Mon Apr 4 08:31:09 2011 +0000

    Allow -M without -S
    
    In general I would not advice doing this, but if you are strictly
    on a fortified localhost or localnet I can see the point.
    
    Fixes	#893

diff --git a/bin/varnishd/varnishd.c b/bin/varnishd/varnishd.c
index f635322..68037ed 100644
--- a/bin/varnishd/varnishd.c
+++ b/bin/varnishd/varnishd.c
@@ -550,9 +550,10 @@ main(int argc, char * const *argv)
 		usage();
 	}
 	if (S_arg == NULL && T_arg == NULL && d_flag == 0 && b_arg == NULL &&
-	    f_arg == NULL) {
+	    f_arg == NULL && M_arg == NULL) {
 		fprintf(stderr,
-		    "At least one of -d, -b, -f, -S or -T must be specified\n");
+		    "At least one of -d, -b, -f, -M, -S or -T "
+		    "must be specified\n");
 		usage();
 	}