From: Timo Sirainen <tss@iki.fi>
Date: Wed, 16 Dec 2009 01:28:14 +0000 (-0500)
Subject: mail storage service: Some flag enums were missing FLAG_ in the middle.
X-Git-Tag: 2.0.beta2~121
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=705f6fbad395e6f014838e797b7dbcaceafd2f1d;p=thirdparty%2Fdovecot%2Fcore.git

mail storage service: Some flag enums were missing FLAG_ in the middle.

--HG--
branch : HEAD
---

diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c
index 16d494fe1d..f5d84473e2 100644
--- a/src/lib-storage/mail-storage-service.c
+++ b/src/lib-storage/mail-storage-service.c
@@ -496,7 +496,7 @@ mail_storage_service_init(struct master_service *service,
 
 	/* do all the global initialization. delay initializing plugins until
 	   we drop privileges the first time. */
-	if ((flags & MAIL_STORAGE_SERVICE_NO_LOG_INIT) == 0) {
+	if ((flags & MAIL_STORAGE_SERVICE_FLAG_NO_LOG_INIT) == 0) {
 		master_service_init_log(service,
 					t_strconcat(service->name, ": ", NULL));
 	}
@@ -658,7 +658,7 @@ mail_storage_service_load_modules(struct mail_storage_service_ctx *ctx,
 
 	if (*user_set->mail_plugins == '\0')
 		return;
-	if ((ctx->flags & MAIL_STORAGE_SERVICE_NO_PLUGINS) != 0)
+	if ((ctx->flags & MAIL_STORAGE_SERVICE_FLAG_NO_PLUGINS) != 0)
 		return;
 
 	mail_set = mail_user_set_get_driver_settings(user_info, user_set,
@@ -774,7 +774,7 @@ int mail_storage_service_next(struct mail_storage_service_ctx *ctx,
 		return -1;
 	}
 
-	if ((ctx->flags & MAIL_STORAGE_SERVICE_NO_LOG_INIT) == 0)
+	if ((ctx->flags & MAIL_STORAGE_SERVICE_FLAG_NO_LOG_INIT) == 0)
 		mail_storage_service_init_log(ctx->service, user);
 
 	if ((ctx->flags & MAIL_STORAGE_SERVICE_FLAG_NO_RESTRICT_ACCESS) == 0) {
diff --git a/src/lib-storage/mail-storage-service.h b/src/lib-storage/mail-storage-service.h
index bb6539eb89..a00dc45e30 100644
--- a/src/lib-storage/mail-storage-service.h
+++ b/src/lib-storage/mail-storage-service.h
@@ -22,9 +22,9 @@ enum mail_storage_service_flags {
 	/* Enable core dumps even when dropping privileges temporarily */
 	MAIL_STORAGE_SERVICE_FLAG_ENABLE_CORE_DUMPS	= 0x40,
 	/* Don't initialize logging or change log prefixes */
-	MAIL_STORAGE_SERVICE_NO_LOG_INIT		= 0x80,
+	MAIL_STORAGE_SERVICE_FLAG_NO_LOG_INIT		= 0x80,
 	/* Don't load plugins in _service_lookup() */
-	MAIL_STORAGE_SERVICE_NO_PLUGINS			= 0x100,
+	MAIL_STORAGE_SERVICE_FLAG_NO_PLUGINS		= 0x100,
 	/* Don't close auth connections because of idling. */
 	MAIL_STORAGE_SERVICE_FLAG_NO_IDLE_TIMEOUT	= 0x200
 };
diff --git a/src/lmtp/main.c b/src/lmtp/main.c
index d1bf6be312..5936098fba 100644
--- a/src/lmtp/main.c
+++ b/src/lmtp/main.c
@@ -57,7 +57,7 @@ int main(int argc, char *argv[])
 		MAIL_STORAGE_SERVICE_FLAG_DISALLOW_ROOT |
 		MAIL_STORAGE_SERVICE_FLAG_USERDB_LOOKUP |
 		MAIL_STORAGE_SERVICE_FLAG_TEMP_PRIV_DROP |
-		MAIL_STORAGE_SERVICE_NO_LOG_INIT |
+		MAIL_STORAGE_SERVICE_FLAG_NO_LOG_INIT |
 		MAIL_STORAGE_SERVICE_FLAG_NO_IDLE_TIMEOUT;
 	int c;
 
diff --git a/src/util/script.c b/src/util/script.c
index ad88962cbf..d8cfc8ced8 100644
--- a/src/util/script.c
+++ b/src/util/script.c
@@ -23,7 +23,8 @@ static bool drop_privileges = FALSE;
 
 static void client_connected(const struct master_service_connection *conn)
 {
-	enum mail_storage_service_flags flags = MAIL_STORAGE_SERVICE_NO_PLUGINS;
+	enum mail_storage_service_flags flags =
+		MAIL_STORAGE_SERVICE_FLAG_NO_PLUGINS;
 	string_t *instr, *keys;
 	const char **args, *key, *value, *error;
 	struct mail_storage_service_ctx *service_ctx;