[dovecot-cvs] dovecot/src/lib-storage/index/dbox dbox-list.c, 1.6.2.1, 1.6.2.2

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot/src/lib-storage/index/dbox
In directory talvi:/tmp/cvs-serv18057

Modified Files:
      Tag: branch_1_0
	dbox-list.c 
Log Message:
Handle reference parameter more like UW-IMAP: If it doesn't begin with
separator, just use it as a prefix to mask. I'm not sure where I got the
earlier rules..



Index: dbox-list.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/dbox/dbox-list.c,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -d -r1.6.2.1 -r1.6.2.2
--- dbox-list.c	18 May 2006 09:38:02 -0000	1.6.2.1
+++ dbox-list.c	6 Aug 2006 21:00:57 -0000	1.6.2.2
@@ -116,10 +116,7 @@
 		/* mask overrides reference */
 	} else if (*ref != '\0') {
 		/* merge reference and mask */
-		if (ref[strlen(ref)-1] == '/')
-			mask = t_strconcat(ref, mask, NULL);
-		else
-			mask = t_strconcat(ref, "/", mask, NULL);
+		mask = t_strconcat(ref, mask, NULL);
 	}
 
 	if ((flags & MAILBOX_LIST_SUBSCRIBED) != 0) {