Removed some unused FIXME code.

--HG--
branch : HEAD

diff --git a/src/lib-index/mail-index-transaction-update.c b/src/lib-index/mail-index-transaction-update.c
index f82d4b30b5625246a9b1e40730b9736526730f16..010a9b33cb95aaeae6f37a06f754615d5f0c0dce 100644 (file)
--- a/src/lib-index/mail-index-transaction-update.c
+++ b/src/lib-index/mail-index-transaction-update.c
@@ -929,8 +929,9 @@ int mail_index_atomic_inc_ext(struct mail_index_transaction *t,
                  seq <= t->last_new_seq));
        i_assert(ext_id < array_count(&t->view->index->extensions));
        /* currently non-external transactions can be applied multiple times,
-          causing multiple increments. */
-       //FIXME:i_assert((t->flags & MAIL_INDEX_TRANSACTION_FLAG_EXTERNAL) != 0);
+          causing multiple increments. FIXME: we need this now and it doesn't
+          actually seem to be a real problem at least right now - why? */
+       /*i_assert((t->flags & MAIL_INDEX_TRANSACTION_FLAG_EXTERNAL) != 0);*/
 
        t->log_ext_updates = TRUE;
        if (!array_is_created(&t->ext_rec_atomics))

diff --git a/src/login-common/main.c b/src/login-common/main.c
index a4b2fc8952ef3f4db3df7cb9f141b132b7d856c6..a45c719af465ce585d058aa4cffd2d644938fb56 100644 (file)
--- a/src/login-common/main.c
+++ b/src/login-common/main.c
@@ -167,8 +167,6 @@ int main(int argc, char *argv[], char *envp[])
        pool_t set_pool;
        int c;
 
-       //FIXME:is_inetd = getenv("DOVECOT_MASTER") == NULL;
-
        master_service = master_service_init(login_process_name,
                                        MASTER_SERVICE_FLAG_KEEP_CONFIG_OPEN,
                                        argc, argv);
@@ -192,13 +190,6 @@ int main(int argc, char *argv[], char *envp[])
                }
        }
 
-#if 0
-       if (is_inetd) {
-               /* running from inetd. create master process before
-                  dropping privileges. */
-               master_fd = master_connect(t_strcut(login_process_name, '-'));
-       }
-#endif
        login_process_preinit();
 
        process_title_init(argv, envp);