From: Art Cancro <ajc@citadel.org>
Date: Mon, 6 Apr 2009 14:54:13 +0000 (+0000)
Subject: * Set zapped_ok to 1 on nearly all calls to imap_grabroom(), because the IMAP command... 
X-Git-Tag: v7.86~1308
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=f3daca93c3590e7bed50a67847a5bb6be5a62c9a

* Set zapped_ok to 1 on nearly all calls to imap_grabroom(), because the IMAP commands in question are permitted to operate with unsubscribed (zapped) rooms.
---

diff --git a/citadel/modules/imap/imap_acl.c b/citadel/modules/imap/imap_acl.c
index c54340a49..e6fe02d4c 100644
--- a/citadel/modules/imap/imap_acl.c
+++ b/citadel/modules/imap/imap_acl.c
@@ -146,7 +146,7 @@ void imap_getacl(int num_parms, char *parms[]) {
 	/*
 	 * Search for the specified room or folder
 	 */
-	ret = imap_grabroom(roomname, parms[2], 0);
+	ret = imap_grabroom(roomname, parms[2], 1);
 	if (ret != 0) {
 		cprintf("%s NO Invalid mailbox name or access denied\r\n",
 			parms[0]);
@@ -219,7 +219,7 @@ void imap_listrights(int num_parms, char *parms[]) {
 	/*
 	 * Search for the specified room/folder
 	 */
-	ret = imap_grabroom(roomname, parms[2], 0);
+	ret = imap_grabroom(roomname, parms[2], 1);
 	if (ret != 0) {
 		cprintf("%s NO Invalid mailbox name or access denied\r\n",
 			parms[0]);
@@ -294,7 +294,7 @@ void imap_myrights(int num_parms, char *parms[]) {
 		return;
 	}
 
-	ret = imap_grabroom(roomname, parms[2], 0);
+	ret = imap_grabroom(roomname, parms[2], 1);
 	if (ret != 0) {
 		cprintf("%s NO Invalid mailbox name or access denied\r\n",
 			parms[0]);
diff --git a/citadel/modules/imap/imap_metadata.c b/citadel/modules/imap/imap_metadata.c
index fef885071..c206e7e45 100644
--- a/citadel/modules/imap/imap_metadata.c
+++ b/citadel/modules/imap/imap_metadata.c
@@ -123,7 +123,7 @@ void imap_setmetadata(int num_parms, char *parms[]) {
 		set_view = VIEW_MAILBOX;
 	}
 
-	ret = imap_grabroom(roomname, parms[2], 0);
+	ret = imap_grabroom(roomname, parms[2], 1);
 	if (ret != 0) {
 		cprintf("%s NO Invalid mailbox name or access denied\r\n",
 			parms[0]);
@@ -200,7 +200,7 @@ void imap_getmetadata(int num_parms, char *parms[]) {
 		return;
 	}
 
-	ret = imap_grabroom(roomname, parms[2], 0);
+	ret = imap_grabroom(roomname, parms[2], 1);
 	if (ret != 0) {
 		cprintf("%s NO Invalid mailbox name or access denied\r\n",
 			parms[0]);
diff --git a/citadel/modules/imap/imap_misc.c b/citadel/modules/imap/imap_misc.c
index 3a9474ccc..5d40f8503 100644
--- a/citadel/modules/imap/imap_misc.c
+++ b/citadel/modules/imap/imap_misc.c
@@ -69,7 +69,7 @@ int imap_do_copy(char *destination_folder) {
 		return(0);
 	}
 
-	i = imap_grabroom(roomname, destination_folder, 0);
+	i = imap_grabroom(roomname, destination_folder, 1);
 	if (i != 0) return(i);
 
 	/*
@@ -359,7 +359,7 @@ void imap_append(int num_parms, char *parms[]) {
 	Imap->transmitted_message = NULL;
 	Imap->transmitted_length = 0;
 
-	ret = imap_grabroom(roomname, parms[2], 0);
+	ret = imap_grabroom(roomname, parms[2], 1);
 	if (ret != 0) {
 		cprintf("%s NO Invalid mailbox name or access denied\r\n",
 			parms[0]);
diff --git a/citadel/modules/imap/serv_imap.c b/citadel/modules/imap/serv_imap.c
index d649c3cfa..274022090 100644
--- a/citadel/modules/imap/serv_imap.c
+++ b/citadel/modules/imap/serv_imap.c
@@ -1025,7 +1025,7 @@ void imap_status(int num_parms, char *parms[])
 	char savedroom[ROOMNAMELEN];
 	int msgs, new;
 
-	ret = imap_grabroom(roomname, parms[2], 0);
+	ret = imap_grabroom(roomname, parms[2], 1);
 	if (ret != 0) {
 		cprintf
 		    ("%s NO Invalid mailbox name or location, or access denied\r\n",
@@ -1127,7 +1127,7 @@ void imap_unsubscribe(int num_parms, char *parms[])
 	char savedroom[ROOMNAMELEN];
 	int msgs, new;
 
-	ret = imap_grabroom(roomname, parms[2], 0);
+	ret = imap_grabroom(roomname, parms[2], 1);
 	if (ret != 0) {
 		cprintf
 		    ("%s NO Invalid mailbox name or location, or access denied\r\n",