dovecot-1.1: Fixes to handling +w permission errors and use it m...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.1/rev/f43a070bc231
changeset: 8105:f43a070bc231
user:      Timo Sirainen <tss at iki.fi>
date:      Fri Jan 16 14:23:10 2009 -0500
description:
Fixes to handling +w permission errors and use it more often.

diffstat:

2 files changed, 8 insertions(+), 8 deletions(-)
src/lib-storage/index/mbox/mbox-storage.c |    6 +++---
src/lib-storage/mail-storage.c            |   10 +++++-----

diffs (48 lines):

diff -r 108633554955 -r f43a070bc231 src/lib-storage/index/mbox/mbox-storage.c
--- a/src/lib-storage/index/mbox/mbox-storage.c	Fri Jan 16 12:52:45 2009 -0500
+++ b/src/lib-storage/index/mbox/mbox-storage.c	Fri Jan 16 14:23:10 2009 -0500
@@ -267,7 +267,7 @@ static const char *create_root_dir(bool 
 
 	path = t_strconcat(home, "/mail", NULL);
 	if (mkdir_parents(path, CREATE_MODE) < 0 && errno != EEXIST) {
-		*error_r = t_strdup_printf("mkdir(%s) failed: %m", path);
+		*error_r = mail_storage_create_eacces_msg("mkdir", path);
 		return NULL;
 	}
 
@@ -357,8 +357,8 @@ mbox_get_list_settings(struct mailbox_li
 			return -1;
 		} else if (mkdir_parents(list_set->root_dir, CREATE_MODE) < 0 &&
 			   errno != EEXIST) {
-			*error_r = t_strdup_printf("mkdir(%s) failed: %m",
-						   list_set->root_dir);
+			*error_r = mail_storage_create_eacces_msg("mkdir",
+							list_set->root_dir);
 			return -1;
 		}
 	}
diff -r 108633554955 -r f43a070bc231 src/lib-storage/mail-storage.c
--- a/src/lib-storage/mail-storage.c	Fri Jan 16 12:52:45 2009 -0500
+++ b/src/lib-storage/mail-storage.c	Fri Jan 16 14:23:10 2009 -0500
@@ -824,16 +824,16 @@ mail_storage_eacces_msg_full(const char 
 				str_printfa(errmsg, " missing +x perm: %s", dir);
 			else
 				str_printfa(errmsg, " access(%s, x) failed: %m", dir);
+		} else if (creating && access(dir, W_OK) < 0) {
+			if (errno == EACCES)
+				str_printfa(errmsg, " missing +w perm: %s", dir);
+			else
+				str_printfa(errmsg, " access(%s, w) failed: %m", dir);
 		} else if (prev_path == path && access(path, R_OK) < 0) {
 			if (errno == EACCES)
 				str_printfa(errmsg, " missing +r perm: %s", path);
 			else
 				str_printfa(errmsg, " access(%s, r) failed: %m", path);
-		} else if (creating && access(dir, W_OK) < 0) {
-			if (errno == EACCES)
-				str_printfa(errmsg, " missing +w perm: %s", dir);
-			else
-				str_printfa(errmsg, " access(%s, w) failed: %m", dir);
 		} else
 			str_printfa(errmsg, " UNIX perms seem ok, ACL problem?");
 	}