From dc7c35479b96456dcca68b7d8e1ae9b9beac1074 Mon Sep 17 00:00:00 2001
From: Timo Sirainen <tss@iki.fi>
Date: Mon, 13 Apr 2009 20:15:14 -0400
Subject: [PATCH] s/deliver/lda/

--HG--
branch : HEAD
---
 src/lda/main.c                               | 6 +++---
 src/lib-storage/index/maildir/maildir-copy.c | 4 ++--
 src/plugins/acl/acl-mailbox-list.c           | 2 +-
 src/plugins/acl/acl-storage.c                | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/lda/main.c b/src/lda/main.c
index 2dc560e8a1..2c3a0f8806 100644
--- a/src/lda/main.c
+++ b/src/lda/main.c
@@ -170,8 +170,8 @@ static void failure_exit_callback(int *status)
 static void print_help(void)
 {
 	printf(
-"Usage: deliver [-c <config file>] [-a <address>] [-d <username>] [-p <path>]\n"
-"               [-f <envelope sender>] [-m <mailbox>] [-e] [-k]\n");
+"Usage: dovecot-lda [-c <config file>] [-a <address>] [-d <username>] [-p <path>]\n"
+"                   [-f <envelope sender>] [-m <mailbox>] [-e] [-k]\n");
 }
 
 int main(int argc, char *argv[])
@@ -198,7 +198,7 @@ int main(int argc, char *argv[])
 	enum mail_error error;
 
 	if (getuid() != geteuid() && geteuid() == 0) {
-		/* running setuid - don't allow this if deliver is
+		/* running setuid - don't allow this if the binary is
 		   executable by anyone */
 		struct stat st;
 
diff --git a/src/lib-storage/index/maildir/maildir-copy.c b/src/lib-storage/index/maildir/maildir-copy.c
index 56ac217c06..2008473dd0 100644
--- a/src/lib-storage/index/maildir/maildir-copy.c
+++ b/src/lib-storage/index/maildir/maildir-copy.c
@@ -140,7 +140,7 @@ maildir_copy_hardlink(struct maildir_transaction_context *t, struct mail *mail,
 	if (strcmp(mail->box->storage->name, MAILDIR_STORAGE_NAME) == 0)
 		src_mbox = (struct maildir_mailbox *)mail->box;
 	else if (strcmp(mail->box->storage->name, "raw") == 0) {
-		/* deliver uses raw format */
+		/* lda uses raw format */
 		src_mbox = NULL;
 	} else {
 		/* Can't hard link files from the source storage */
@@ -220,7 +220,7 @@ maildir_copy_hardlink(struct maildir_transaction_context *t, struct mail *mail,
 				    do_hardlink, &do_ctx) < 0)
 			return -1;
 	} else {
-		/* raw / deliver */
+		/* raw / lda */
 		if (mail_get_special(mail, MAIL_FETCH_UIDL_FILE_NAME,
 				     &path) < 0 || *path == '\0')
 			return 0;
diff --git a/src/plugins/acl/acl-mailbox-list.c b/src/plugins/acl/acl-mailbox-list.c
index 89116b8b8c..69c7df482c 100644
--- a/src/plugins/acl/acl-mailbox-list.c
+++ b/src/plugins/acl/acl-mailbox-list.c
@@ -565,7 +565,7 @@ void acl_mailbox_list_created(struct mailbox_list *list)
 	if (auser == NULL) {
 		/* ACLs disabled for this user */
 	} else if ((list->ns->flags & NAMESPACE_FLAG_INTERNAL) != 0) {
-		/* no ACL checks for internal namespaces (deliver, shared) */
+		/* no ACL checks for internal namespaces (lda, shared) */
 		if (list->ns->type == NAMESPACE_SHARED)
 			acl_mailbox_list_init_shared(list);
 	} else {
diff --git a/src/plugins/acl/acl-storage.c b/src/plugins/acl/acl-storage.c
index fa34d48a62..effabea656 100644
--- a/src/plugins/acl/acl-storage.c
+++ b/src/plugins/acl/acl-storage.c
@@ -176,7 +176,7 @@ void acl_mail_storage_created(struct mail_storage *storage)
 	if (auser == NULL) {
 		/* ACLs disabled for this user */
 	} else if ((storage->ns->flags & NAMESPACE_FLAG_INTERNAL) != 0) {
-		/* no ACL checks for internal namespaces (deliver) */
+		/* no ACL checks for internal namespaces (lda) */
 	} else {
 		astorage = p_new(storage->pool, struct acl_mail_storage, 1);
 		astorage->module_ctx.super = storage->v;
-- 
2.47.3