[master] 5c46217 Check -T and -M arguments sooner.

[Poul-Henning Kamp]

commit 5c46217512f24aae44a086f3ebeade234cb08f5f
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sun Mar 5 00:01:10 2017 +0000

    Check -T and -M arguments sooner.
    
    Fixes #2217

diff --git a/bin/varnishd/mgt/mgt_main.c b/bin/varnishd/mgt/mgt_main.c
index 9056a9d..fa69dcd 100644
--- a/bin/varnishd/mgt/mgt_main.c
+++ b/bin/varnishd/mgt/mgt_main.c
@@ -758,6 +758,11 @@ main(int argc, char * const *argv)
 		VJ_master(JAIL_MASTER_LOW);
 	}
 
+	if (M_arg != NULL)
+		mgt_cli_master(M_arg);
+	if (T_arg != NULL)
+		mgt_cli_telnet(T_arg);
+
 	if (VIN_N_Arg(n_arg, &heritage.name, &dirname, NULL) != 0)
 		ARGV_ERR("Invalid instance (-n) name: %s\n", strerror(errno));
 
@@ -844,11 +849,6 @@ main(int argc, char * const *argv)
 	if (strcmp(S_arg, "none"))
 		mgt_cli_secret(S_arg);
 
-	if (M_arg != NULL)
-		mgt_cli_master(M_arg);
-	if (T_arg != NULL)
-		mgt_cli_telnet(T_arg);
-
 	mgt_SHM_Create();
 
 	if (!d_flag && !mgt_has_vcl() && !novcl)