changeset 7247:17c65dfdac2a HEAD

Check for "/./" chrooting in home dirs only if valid_chroot_dirs isn't empty.
author Timo Sirainen <tss@iki.fi>
date Fri, 15 Feb 2008 14:52:00 +0200
parents 599a9c679ee2
children 139f2f03b81b
files src/master/mail-process.c
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/master/mail-process.c	Fri Feb 15 14:04:06 2008 +0200
+++ b/src/master/mail-process.c	Fri Feb 15 14:52:00 2008 +0200
@@ -597,8 +597,10 @@
 		}
 	}
 
-	if (*chroot_dir == '\0' && (p = strstr(home_dir, "/./")) != NULL) {
-		/* wu-ftpd like <chroot>/./<home> */
+	if (*chroot_dir == '\0' && *set->valid_chroot_dirs != '\0' &&
+	    (p = strstr(home_dir, "/./")) != NULL) {
+		/* wu-ftpd like <chroot>/./<home> - check only if there's even
+		   a possibility of using them (non-empty valid_chroot_dirs)*/
 		chroot_dir = t_strdup_until(home_dir, p);
 		home_dir = p + 2;
 	} else if (*chroot_dir != '\0' && *home_dir != '/') {