From 47131322bd0b56917d4a3c1e28dbfbaa6668e747 Mon Sep 17 00:00:00 2001
From: Timo Sirainen <tss@iki.fi>
Date: Wed, 2 Jun 2010 17:21:21 +0100
Subject: [PATCH] Renamed "script" binary to "script-login".

--HG--
branch : HEAD
---
 .hgignore                             |  2 +-
 src/util/Makefile.am                  | 10 +++++-----
 src/util/{script.c => script-login.c} | 12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)
 rename src/util/{script.c => script-login.c} (94%)

diff --git a/.hgignore b/.hgignore
index f9ae67d6f2..436b6f1c7a 100644
--- a/.hgignore
+++ b/.hgignore
@@ -86,7 +86,7 @@ src/util/imap-utf7
 src/util/listview
 src/util/maildirlock
 src/util/rawlog
-src/util/script
+src/util/script-login
 src/util/tcpwrap
 src/plugins/quota/rquota_xdr.c
 src/plugins/quota/rquota.h
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index cb16b024ad..4f4bfdabb3 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -2,7 +2,7 @@ pkglibexecdir = $(libexecdir)/dovecot
 
 pkglibexec_PROGRAMS = \
 	rawlog \
-	script \
+	script-login \
 	$(TCPWRAP_BIN) \
 	gdbhelper \
 	listview \
@@ -27,10 +27,10 @@ rawlog_DEPENDENCIES = $(LIBDOVECOT_DEPS)
 rawlog_SOURCES = \
 	rawlog.c
 
-script_LDADD = $(LIBDOVECOT_STORAGE) $(LIBDOVECOT) $(MODULE_LIBS)
-script_DEPENDENCIES = $(LIBDOVECOT_STORAGE) $(LIBDOVECOT_DEPS)
-script_SOURCES = \
-	script.c
+script_login_LDADD = $(LIBDOVECOT_STORAGE) $(LIBDOVECOT) $(MODULE_LIBS)
+script_login_DEPENDENCIES = $(LIBDOVECOT_STORAGE) $(LIBDOVECOT_DEPS)
+script_login_SOURCES = \
+	script-login.c
 
 if TCPWRAPPERS
 TCPWRAP_BIN = tcpwrap
diff --git a/src/util/script.c b/src/util/script-login.c
similarity index 94%
rename from src/util/script.c
rename to src/util/script-login.c
index 1787ec9121..4ede4b7dea 100644
--- a/src/util/script.c
+++ b/src/util/script-login.c
@@ -68,7 +68,7 @@ static void client_connected(struct master_service_connection *conn)
 	i = 0;
 	memset(&input, 0, sizeof(input));
 	input.module = "mail"; /* need to get mail_uid, mail_gid */
-	input.service = "script";
+	input.service = "script-login";
 	(void)net_addr2ip(args[i++], &input.local_ip);
 	(void)net_addr2ip(args[i++], &input.remote_ip);
 	input.username = args[i++];
@@ -90,7 +90,7 @@ static void client_connected(struct master_service_connection *conn)
 	env_put(t_strconcat(ENV_USERDB_KEYS"=", str_c(keys), NULL));
 
 	master_service_init_log(master_service,
-		t_strdup_printf("script(%s): ", input.username));
+		t_strdup_printf("script-login(%s): ", input.username));
 
 	service_ctx = mail_storage_service_init(master_service, NULL, flags);
 	if (mail_storage_service_lookup(service_ctx, &input, &user, &error) <= 0)
@@ -163,7 +163,7 @@ int main(int argc, char *argv[])
 	if (getenv(MASTER_UID_ENV) == NULL)
 		flags |= MASTER_SERVICE_FLAG_STANDALONE;
 
-	master_service = master_service_init("script", flags,
+	master_service = master_service_init("script-login", flags,
 					     &argc, &argv, "d");
 	while ((c = master_getopt(master_service)) > 0) {
 		switch (c) {
@@ -177,7 +177,7 @@ int main(int argc, char *argv[])
 	argc -= optind;
 	argv += optind;
 
-	master_service_init_log(master_service, "script: ");
+	master_service_init_log(master_service, "script-login: ");
 	master_service_init_finish(master_service);
 	master_service_set_service_count(master_service, 1);
 
@@ -185,11 +185,11 @@ int main(int argc, char *argv[])
 		script_execute_finish();
 	else {
 		if (argv[0] == NULL)
-			i_fatal("Missing script path");
+			i_fatal("Missing script-login path");
 		exec_args = i_new(const char *, argc + 2);
 		for (i = 0; i < argc; i++)
 			exec_args[i] = argv[i];
-		exec_args[i] = PKG_LIBEXECDIR"/script";
+		exec_args[i] = PKG_LIBEXECDIR"/script-login";
 		exec_args[i+1] = NULL;
 
 		if (exec_args[0][0] != '/') {
-- 
2.47.3