[master] ab512a9 Consistently use "mgt"

[Poul-Henning Kamp]

commit ab512a907bbe35eea6c73d885f0b752f3d692da9
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Sep 13 14:39:32 2017 +0000

    Consistently use "mgt"
    
    Spottes by:	dridi

diff --git a/bin/varnishd/mgt/mgt_child.c b/bin/varnishd/mgt/mgt_child.c
index ebcaba5..b3b8856 100644
--- a/bin/varnishd/mgt/mgt_child.c
+++ b/bin/varnishd/mgt/mgt_child.c
@@ -308,13 +308,13 @@ mgt_launch_child(struct cli *cli)
 
 	child_state = CH_STARTING;
 
-	/* Open pipe for mgr->child CLI */
+	/* Open pipe for mgt->child CLI */
 	AZ(pipe(cp));
 	heritage.cli_in = cp[0];
 	MCH_Fd_Inherit(heritage.cli_in, "cli_in");
 	child_cli_out = cp[1];
 
-	/* Open pipe for child->mgr CLI */
+	/* Open pipe for child->mgt CLI */
 	AZ(pipe(cp));
 	heritage.cli_out = cp[1];
 	MCH_Fd_Inherit(heritage.cli_out, "cli_out");
diff --git a/bin/varnishd/mgt/mgt_jail_unix.c b/bin/varnishd/mgt/mgt_jail_unix.c
index 4d4c56d..f9c0157 100644
--- a/bin/varnishd/mgt/mgt_jail_unix.c
+++ b/bin/varnishd/mgt/mgt_jail_unix.c
@@ -46,7 +46,7 @@
 #include <sys/prctl.h>
 #endif
 
-static gid_t vju_mgr_gid;
+static gid_t vju_mgt_gid;
 static uid_t vju_uid;
 static gid_t vju_gid;
 static const char *vju_user;
@@ -166,7 +166,7 @@ vju_init(char **args)
 
 	AN(vju_user);
 
-	vju_mgr_gid = getgid();
+	vju_mgt_gid = getgid();
 
 	if (vju_wrkuser == NULL && vju_getwrkuid(VCACHE_USER)) {
 		vju_wrkuid = vju_uid;
@@ -191,7 +191,7 @@ vju_master(enum jail_master_e jme)
 		AZ(seteuid(vju_uid));
 	} else {
 		AZ(seteuid(0));
-		AZ(setegid(vju_mgr_gid));
+		AZ(setegid(vju_mgt_gid));
 	}
 }
 
diff --git a/bin/varnishd/mgt/mgt_main.c b/bin/varnishd/mgt/mgt_main.c
index 8a5f918..2b341f4 100644
--- a/bin/varnishd/mgt/mgt_main.c
+++ b/bin/varnishd/mgt/mgt_main.c
@@ -758,7 +758,7 @@ main(int argc, char * const *argv)
 		i_arg = mgt_HostName();
 	heritage.identity = i_arg;
 
-	mgt_ProcTitle("Mgr");
+	mgt_ProcTitle("Mgt");
 
 	openlog("varnishd", LOG_PID, LOG_LOCAL0);