From 5fffa07efe1cc9472ded8445f9cf8e5f59ae566a Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Tue, 16 Mar 2010 20:40:11 +0200 Subject: [PATCH] mail_storage_service_lookup_next() returns -2 for if _next() fails. --HG-- branch : HEAD --- src/lib-storage/mail-storage-service.c | 2 +- src/lib-storage/mail-storage-service.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/lib-storage/mail-storage-service.c b/src/lib-storage/mail-storage-service.c index 58f9c75cd0..41b84d5d06 100644 --- a/src/lib-storage/mail-storage-service.c +++ b/src/lib-storage/mail-storage-service.c @@ -932,7 +932,7 @@ int mail_storage_service_lookup_next(struct mail_storage_service_ctx *ctx, if (mail_storage_service_next(ctx, user, mail_user_r, &error) < 0) { mail_storage_service_user_free(&user); *error_r = t_strdup_printf("User init failed: %s", error); - return -1; + return -2; } *user_r = user; return 1; diff --git a/src/lib-storage/mail-storage-service.h b/src/lib-storage/mail-storage-service.h index 75148c67ad..8b040506e1 100644 --- a/src/lib-storage/mail-storage-service.h +++ b/src/lib-storage/mail-storage-service.h @@ -66,13 +66,15 @@ int mail_storage_service_lookup(struct mail_storage_service_ctx *ctx, const struct mail_storage_service_input *input, struct mail_storage_service_user **user_r, const char **error_r); +/* Returns 0 if ok, -1 if user had invalid settings. */ int mail_storage_service_next(struct mail_storage_service_ctx *ctx, struct mail_storage_service_user *user, struct mail_user **mail_user_r, const char **error_r); void mail_storage_service_restrict_setenv(struct mail_storage_service_ctx *ctx, struct mail_storage_service_user *user); -/* Combine lookup() and next() into one call. */ +/* Combine lookup() and next() into one call. If either one fails with + "invalid settings", this function returns -2. */ int mail_storage_service_lookup_next(struct mail_storage_service_ctx *ctx, const struct mail_storage_service_input *input, struct mail_storage_service_user **user_r, -- 2.47.3