s/deliver/lda/

--HG--
branch : HEAD

diff --git a/src/lda/main.c b/src/lda/main.c
index 2dc560e8a1933c692cfdf698faeb50d184b71692..2c3a0f8806040e0b7d1dabc5fd7250b427b48081 100644 (file)
--- 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 56ac217c063559d895904711171ae6b3afdc335a..2008473dd0499c8ff2a924237dc9dad0d33dc435 100644 (file)
--- 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 89116b8b8c3674e1d4a90ef5c04ea34753b4b8de..69c7df482c31b0f7f391289122f55bee2baf60b3 100644 (file)
--- 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 fa34d48a62c423aa944eed2f14904890ed55b009..effabea65625892ff26a2288097d1af3dd910962 100644 (file)
--- 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;