X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fmod-domaintree;a=blobdiff_plain;f=mod_domaintree.c;h=94db127a1efafef6b36da86f4518e2c1f41b56ee;hp=018178ae94cbd939d364a7ac98626af98806885f;hb=HEAD;hpb=65bed6e56aed99ba2289228086632db6415014a0

diff --git a/mod_domaintree.c b/mod_domaintree.c
index 018178a..94db127 100644
--- a/mod_domaintree.c
+++ b/mod_domaintree.c
@@ -29,6 +29,12 @@
  * DomainTreeAlias /??/exmaple /com/exmaple
  * DomainTreeAlias /???/example /com/example
  * DomainTreeAlias /*one/ /anyone/
+ * DomainTreeIgnore *.foo.com *.foo.co.uk
+ * DomainTreeForbid html.*
+ * <Directory "/sites/com/example/users">
+ * # e.g. a symlink to /home
+ *     DomainTreeSuexec
+ * </Directory>
  *
  *	/sites
  *		+- /at
@@ -54,7 +60,7 @@
 
 #define MODULE	"mod_domaintree"
 #define AUTHOR	"<mike@iworks.at>"
-#define VERSION "1.4"
+#define VERSION "1.6"
 
 /* {{{ Includes */
 
@@ -87,6 +93,17 @@ module AP_MODULE_DECLARE_DATA domaintree_module;
 /* }}} */
 /* {{{ Macros & Types */
 
+#ifndef HAVE_UNIX_SUEXEC
+#	ifdef SUEXEC_BIN
+#		define HAVE_UNIX_SUEXEC
+#	endif
+#endif
+#ifdef HAVE_UNIX_SUEXEC
+#	include "unixd.h"
+#endif
+
+#define DBG 0
+
 #define MDT_CNF domaintree_conf
 #define MDT_PTR (&domaintree_module)
 
@@ -96,12 +113,15 @@ module AP_MODULE_DECLARE_DATA domaintree_module;
 
 #define NUL '\0'
 #define EMPTY(str) ((str == NULL) || (*(str) == NUL))
-#define local static APR_INLINE
+#if DBG
+#	define local static
+#else
+#	define local static APR_INLINE
+#endif
 
-#define DT_LOG_ERR ap_log_error(APLOG_MARK, APLOG_ERR, APR_SUCCESS, DT->server, 
-#define DT_LOG_WRN ap_log_error(APLOG_MARK, APLOG_WARNING, APR_SUCCESS, DT->server, 
-#define DT_LOG_DBG ap_log_error(APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, DT->server, 
-#define DT_LOG_END );
+#define DT_LOG_ERR APLOG_MARK, APLOG_ERR, APR_SUCCESS, DT->server, "DomainTree: "
+#define DT_LOG_WRN APLOG_MARK, APLOG_WARNING, APR_SUCCESS, DT->server, "DomainTree: "
+#define DT_LOG_DBG APLOG_MARK, APLOG_DEBUG, APR_SUCCESS, DT->server, "DomainTree: "
 
 typedef int STATUS;
 
@@ -124,6 +144,8 @@ typedef struct {
 	apr_global_mutex_t	*lock;
 } dircache_t;
 
+typedef apr_array_header_t *hostlist_t, *pathlist_t;
+
 typedef struct {
 	server_rec	*server;
 	int			enabled;
@@ -134,8 +156,80 @@ typedef struct {
 	char		*suffix;
 	aliases_t	aliases;
 	dircache_t	dircache;
+	hostlist_t	ignore;
+	hostlist_t	forbid;
+#ifdef HAVE_UNIX_SUEXEC
+	pathlist_t	suexec;
+#endif
 } domaintree_conf;
 
+/* }}} */
+/* {{{ dircache */
+
+local char *domaintree_cache_get(MDT_CNF *DT, apr_time_t atime, const char *host)
+{
+	char *path = NULL;
+	dircache_entry_t *cache_entry;
+	
+	apr_global_mutex_lock(DT->dircache.lock);
+	
+	if ((cache_entry = apr_hash_get(DT->dircache.hmap, host, APR_HASH_KEY_STRING))) {
+		cache_entry->lacc = atime;
+		path = cache_entry->path;
+	}
+	
+	apr_global_mutex_unlock(DT->dircache.lock);
+	
+	if (path) {
+		ap_log_error(DT_LOG_DBG "cache hit = %s for %s", path, host);
+	}
+	
+	return path;
+}
+
+local void domaintree_cache_set(MDT_CNF *DT, apr_time_t atime, const char *host, const char *path)
+{
+	apr_pool_t *pool;
+	dircache_entry_t *cache_entry;
+	
+	apr_pool_create(&pool, DT->dircache.pool);
+	cache_entry = apr_palloc(pool, sizeof(dircache_entry_t));
+	
+	cache_entry->pool = pool;
+	cache_entry->lacc = atime;
+	cache_entry->host = apr_pstrdup(pool, host);
+	cache_entry->path = apr_pstrdup(pool, path);
+	
+	apr_global_mutex_lock(DT->dircache.lock);
+	
+	if (apr_hash_count(DT->dircache.hmap) >= DT->dircache.clim) {
+		apr_hash_index_t *idx;
+		dircache_entry_t *purge_this = NULL;
+	
+		ap_log_error(DT_LOG_WRN "reached cache limit (%ld)", DT->dircache.clim);
+		
+		for (idx = apr_hash_first(DT->dircache.pool, DT->dircache.hmap); idx; idx = apr_hash_next(idx)) {
+			dircache_entry_t *current;
+		
+			apr_hash_this(idx, NULL, NULL, (void *) &current);
+			if ((!purge_this) || (purge_this->lacc > current->lacc)) {
+				purge_this = current;
+			}
+		}
+	
+		if (purge_this) {
+			ap_log_error(DT_LOG_DBG "cache del = %s", purge_this->host);
+			apr_hash_set(DT->dircache.hmap, purge_this->host, APR_HASH_KEY_STRING, NULL);
+			apr_pool_destroy(purge_this->pool);
+		}
+	}
+	apr_hash_set(DT->dircache.hmap, cache_entry->host, APR_HASH_KEY_STRING, cache_entry);
+	
+	apr_global_mutex_unlock(DT->dircache.lock);
+	
+	ap_log_error(DT_LOG_DBG "cache set = %s for %s", path, host);
+}
+
 /* }}} */
 /* {{{ Helpers */
 
@@ -173,7 +267,7 @@ local int strmatch(const char *match, const char *string, const char **begin, co
 {
 	*begin = *end = NULL;
 	
-	while (*match)
+	while (*match && *string)
 	{
 		switch (*match)
 		{
@@ -195,7 +289,7 @@ local int strmatch(const char *match, const char *string, const char **begin, co
 					*end = string;
 					return 0;
 				}
-			break;
+				break;
 			
 			case '?':
 				if (!*begin) {
@@ -203,7 +297,7 @@ local int strmatch(const char *match, const char *string, const char **begin, co
 				}
 				++string;
 				++match;
-			break;
+				break;
 			
 			default:
 				if (*match == *string) {
@@ -218,7 +312,7 @@ local int strmatch(const char *match, const char *string, const char **begin, co
 					}
 				}
 				++string;
-			break;
+				break;
 		}
 	}
 	
@@ -230,15 +324,14 @@ local char *struniqchr(char *string, char uniq)
 {
 	char *ptr = string;
 	
-	while (*ptr) {
-		if (*ptr == uniq && *(ptr + 1) == uniq) {
-			char *pos = ptr + 1;
+	while (ptr[0]) {
+		if (ptr[0] == uniq && ptr[1] == uniq) {
+			char *pos = &ptr[1];
 			
-			while (*(pos + 1) == uniq) {
-				++pos;
+			for (; pos[1] == uniq; ++pos);
+			for (; pos[0]; ++pos) {
+				pos[0] = pos[1];
 			}
-			
-			memmove(ptr, pos, strlen(pos) + 1);
 		}
 		++ptr;
 	}
@@ -252,9 +345,7 @@ local char *domaintree_host(apr_pool_t *pool, MDT_CNF *DT, const char *host_name
 	char *port, *host;
 	
 	if (EMPTY(host_name)) {
-		DT_LOG_WRN
-			"DomainTree: no host/server name"
-		DT_LOG_END
+		ap_log_error(DT_LOG_WRN "no host/server name");
 		return NULL;
 	}
 	
@@ -272,9 +363,7 @@ local char *domaintree_host(apr_pool_t *pool, MDT_CNF *DT, const char *host_name
 	/* strip leading & trailing dots */
 	host = trim(host, len, '.', TRIM_BOTH);
 	
-	DT_LOG_DBG
-		"DomainTree: host name = %s for %s", host, host_name
-	DT_LOG_END
+	ap_log_error(DT_LOG_DBG "host name = %s for %s", host, host_name);
 	
 	return host;
 }
@@ -289,9 +378,7 @@ local char *domaintree_path(apr_pool_t *pool, MDT_CNF *DT, const char *host_name
 		
 		/* check max depth */
 		if (++depth > maxdepth) {
-			DT_LOG_ERR
-				"DomainTree: maxdepth exceeded (%ld)", maxdepth
-			DT_LOG_END
+			ap_log_error(DT_LOG_ERR "maxdepth exceeded (%ld)", maxdepth);
 			return NULL;
 		}
 		
@@ -300,9 +387,7 @@ local char *domaintree_path(apr_pool_t *pool, MDT_CNF *DT, const char *host_name
 			
 			/* strip WWW */
 			if ((DT->stripwww > 0) && (depth == 1) && (!strncmp(host, "www.", sizeof("www")))) {
-				DT_LOG_DBG
-					"DomainTree: strip www"
-				DT_LOG_END
+				ap_log_error(DT_LOG_DBG "strip www");
 			} else {
 				path = apr_pstrcat(pool, apr_pstrndup(pool, host, host_ptr - host), "/", path, NULL);
 			}
@@ -316,9 +401,7 @@ local char *domaintree_path(apr_pool_t *pool, MDT_CNF *DT, const char *host_name
 		path = apr_pstrcat(pool, host, "/", path, NULL);
 	}
 	
-	DT_LOG_DBG
-		"DomainTree: path name = %s for %s", path, host_name
-	DT_LOG_END
+	ap_log_error(DT_LOG_DBG "path name = %s for %s", path, host_name);
 	
 	return path;
 }
@@ -339,28 +422,18 @@ local void domaintree_fake(apr_pool_t *pool, MDT_CNF *DT, char **path)
 		more = 0;
 		
 		if (recurlevel++ > DT->aliases.recursion) {
-			DT_LOG_ERR
-				"DomainTree: maximum alias recursion level (%ld) exceeded! "
-				"Check if you have recursive definitions of DomainTreeAlias directives.", 
-				DT->aliases.recursion
-			DT_LOG_END
+			ap_log_error(DT_LOG_ERR	"maximum alias recursion level (%ld) exceeded! Check if you have recursive definitions of DomainTreeAlias directives.", DT->aliases.recursion);
 			break;
 		}
 		
 		for (i = 0; i < header->nelts; ++i) {
 			const char *begin, *end;
 			
-			DT_LOG_DBG
-				"DomainTree: fake test = %s on %s", array[i].key, *path
-			DT_LOG_END
-			
+			ap_log_error(DT_LOG_DBG "fake test = %s on %s", array[i].key, *path);
 			if (strmatch(array[i].key, *path, &begin, &end)) {
-				more = 1;
+				ap_log_error(DT_LOG_DBG "fake done = %s (%s <> %s)", *path, array[i].key, array[i].val);
 				*path = apr_pstrcat(local_pool, "/", apr_pstrndup(local_pool, *path, begin - *path), "/", array[i].val, "/", end, NULL);
-				
-				DT_LOG_DBG
-					"DomainTree: fake done = %s (%s <> %s)", *path, array[i].key, array[i].val
-				DT_LOG_END
+				more = 1;
 			}
 		}
 	} while (more && (DT->aliases.recursion > 0));
@@ -370,76 +443,36 @@ local void domaintree_fake(apr_pool_t *pool, MDT_CNF *DT, char **path)
 	apr_pool_destroy(local_pool);
 }
 
-local char *domaintree_cache_get(MDT_CNF *DT, apr_time_t atime, const char *host)
-{
-	char *path = NULL;
-	dircache_entry_t *cache_entry;
-	
-	apr_global_mutex_lock(DT->dircache.lock);
-	
-	if ((cache_entry = apr_hash_get(DT->dircache.hmap, host, APR_HASH_KEY_STRING))) {
-		cache_entry->lacc = atime;
-		path = cache_entry->path;
-	}
-	
-	apr_global_mutex_unlock(DT->dircache.lock);
-	
-	if (path) {
-		DT_LOG_DBG
-			"DomainTree: cache hit = %s for %s", path, host
-		DT_LOG_END
-	}
-	
-	return path;
-}
-
-local void domaintree_cache_set(MDT_CNF *DT, apr_time_t atime, const char *host, const char *path)
+#define TEST_IS_BOS 1
+#define TEST_IS_EOS 2
+#define TEST_IS_AOS 3
+local int domaintree_test(MDT_CNF *DT, const char *host, int argc, const char **argv, int flags, const char **bos, const char **eos)
 {
-	apr_pool_t *pool;
-	dircache_entry_t *cache_entry;
-	
-	apr_pool_create(&pool, DT->dircache.pool);
-	cache_entry = apr_palloc(pool, sizeof(dircache_entry_t));
-	
-	cache_entry->pool = pool;
-	cache_entry->lacc = atime;
-	cache_entry->host = apr_pstrdup(pool, host);
-	cache_entry->path = apr_pstrdup(pool, path);
-	
-	apr_global_mutex_lock(DT->dircache.lock);
-	
-	if (apr_hash_count(DT->dircache.hmap) >= DT->dircache.clim) {
-		apr_hash_index_t *idx;
-		dircache_entry_t *purge_this = NULL;
-	
-		DT_LOG_WRN
-				"DomainTree: reached cache limit (%ld)", DT->dircache.clim
-		DT_LOG_END
-		
-		for (idx = apr_hash_first(DT->dircache.pool, DT->dircache.hmap); idx; idx = apr_hash_next(idx)) {
-			dircache_entry_t *current;
+	if (argc) {
+		int i;
+		const char *begin, *end, *host_end = host + strlen(host);
 		
-			apr_hash_this(idx, NULL, NULL, (void *) &current);
-			if ((!purge_this) || (purge_this->lacc > current->lacc)) {
-				purge_this = current;
+		for (i = 0; i < argc; ++i) {
+			ap_log_error(DT_LOG_DBG "host test = %s <> %s", argv[i], host);
+			if (strmatch(argv[i], host, &begin, &end)) {
+				if ((flags & TEST_IS_BOS) && begin != host) {
+					continue;
+				}
+				if ((flags & TEST_IS_EOS) && end != host_end) {
+					continue;
+				}
+				if (bos) {
+					*bos = begin;
+				}
+				if (eos) {
+					*eos = end;
+				}
+				ap_log_error(DT_LOG_DBG "test done = %s by %s", host, argv[i]);
+				return i+1;
 			}
 		}
-	
-		if (purge_this) {
-			DT_LOG_DBG
-					"DomainTree: cache del = %s", purge_this->host
-			DT_LOG_END
-			apr_hash_set(DT->dircache.hmap, purge_this->host, APR_HASH_KEY_STRING, NULL);
-			apr_pool_destroy(purge_this->pool);
-		}
 	}
-	apr_hash_set(DT->dircache.hmap, cache_entry->host, APR_HASH_KEY_STRING, cache_entry);
-	
-	apr_global_mutex_unlock(DT->dircache.lock);
-	
-	DT_LOG_DBG
-		"DomainTree: cache set = %s for %s", path, host
-	DT_LOG_END
+	return 0;
 }
 
 /* }}} */
@@ -453,22 +486,32 @@ static STATUS domaintree_hook_post_config(apr_pool_t *pconf, apr_pool_t *plog, a
 
 static STATUS domaintree_hook_translate_name(request_rec *r)
 {
-	MDT_CNF *DT = NULL;
+	MDT_CNF *DT;
 	char *host, *path, *docroot;
 	
 	if ((!(DT = GET_MDT_CNF(r->server))) || (DT->enabled < 1)) {
 		return DECLINED;
 	}
 	
-	DT_LOG_DBG
-		"DomainTree: processid = %d", (int) getpid()
-	DT_LOG_END
+#if DBG
+	ap_log_error(DT_LOG_DBG "processid = %d", (int) getpid());
+#endif
 	
 	/* get a usable host name */
 	if (!(host = domaintree_host(r->pool, DT, ap_get_server_name(r)))) {
 		return DECLINED;
 	}
 	
+	/* ignore? */
+	if (domaintree_test(DT, host, DT->ignore->nelts, (const char **) DT->ignore->elts, TEST_IS_AOS, NULL, NULL)) {
+		return DECLINED;
+	}
+	
+	/* forbid? */
+	if (domaintree_test(DT, host, DT->forbid->nelts, (const char **) DT->forbid->elts, TEST_IS_AOS, NULL, NULL)) {
+		return HTTP_FORBIDDEN;
+	}
+	
 	/* check cache */
 	if ((DT->dircache.clim < 1) || (!(path = domaintree_cache_get(DT, r->request_time, host)))) {
 		/* build path */
@@ -482,7 +525,7 @@ static STATUS domaintree_hook_translate_name(request_rec *r)
 		}
 		
 		/* add to cache */
-		if (DT->dircache.clim) {
+		if (DT->dircache.clim > 0) {
 			domaintree_cache_set(DT, r->request_time, host, path);
 		}
 	}
@@ -494,44 +537,74 @@ static STATUS domaintree_hook_translate_name(request_rec *r)
 	if (DT->statroot > 0) {
 		apr_finfo_t sb;
 		
-		switch (apr_stat(&sb, docroot, APR_FINFO_MIN, r->pool))
-		{
+		switch (apr_stat(&sb, docroot, APR_FINFO_MIN, r->pool)) {
 			case APR_SUCCESS:
 			case APR_INCOMPLETE:
-				DT_LOG_DBG
-					"DomainTree: stat path = %s (success)", docroot
-				DT_LOG_END
-			break;
+				ap_log_error(DT_LOG_DBG "stat path = %s (success)", docroot);
+				break;
 			
 			default:
-				DT_LOG_DBG
-					"DomainTree: stat path = %s (failure)", docroot
-				DT_LOG_END
+				ap_log_error(DT_LOG_DBG "stat path = %s (failure)", docroot);
 				return DECLINED;
-			break;
 		}
 	}
 	
 	/* set virtual docroot */
 	apr_table_set(r->subprocess_env, "VIRTUAL_DOCUMENT_ROOT", docroot);
 	
+#ifdef HAVE_UNIX_SUEXEC
+	/* set suexec note */
+	{
+		const char *username, *separator;
+		
+		if (domaintree_test(DT, docroot, DT->suexec->nelts, DT->suexec->elts, TEST_IS_BOS, NULL, &username)) {
+			if ((separator = strchr(username, '/'))) {
+				username = apr_pstrndup(r->pool, username, separator-username);
+			} else {
+				username = apr_pstrdup(r->pool, username);
+			}
+			apr_table_setn(r->notes, "mod_domaintree.suexec", username);
+		}
+	}
+#endif
+	
 	/* done */
 	r->canonical_filename = "";
 	r->filename = apr_pstrcat(r->pool, docroot, EMPTY(r->uri) ? NULL : ('/' == *r->uri ? r->uri + 1 : r->uri), NULL);
 	
-	DT_LOG_DBG
-		"DomainTree: path done = %s", r->filename
-	DT_LOG_END
+	ap_log_error(DT_LOG_DBG "path done = %s", r->filename);
 	
 	return OK;
 }
 
+#ifdef HAVE_UNIX_SUEXEC
+static ap_unix_identity_t *domaintree_hook_get_suexec_identity(const request_rec *r)
+{
+	ap_unix_identity_t *ugid = NULL;
+#if APR_HAS_USER
+	const char *username;
+	
+	if ((username = apr_table_get(r->notes, "mod_domaintree.suexec"))) {
+		if ((ugid = apr_palloc(r->pool, sizeof(*ugid)))) {
+			if (APR_SUCCESS == apr_uid_get(&ugid->uid, &ugid->gid, username, r->pool)) {
+				ugid->userdir = 1;
+			}
+		}
+	}
+#endif
+	return ugid;
+}
+#endif
+
 static void domaintree_hooks(apr_pool_t *pool)
 {
 	static const char * const pre[] = {"mod_alias.c", "mod_userdir.c", NULL};
 	
 	ap_hook_post_config(domaintree_hook_post_config, NULL, NULL, APR_HOOK_MIDDLE);
 	ap_hook_translate_name(domaintree_hook_translate_name, pre, NULL, APR_HOOK_FIRST);
+#ifdef HAVE_UNIX_SUEXEC
+	ap_hook_get_suexec_identity(domaintree_hook_get_suexec_identity, NULL, NULL, APR_HOOK_FIRST);
+#endif
 }
 
 /* }}} */
@@ -550,6 +623,12 @@ static void *domaintree_create_srv(apr_pool_t *p, server_rec *s)
 	DT->prefix = "/var/www";
 	DT->suffix = "public_html";
 	
+	DT->ignore = apr_array_make(p, 0, sizeof(char *));
+	DT->forbid = apr_array_make(p, 0, sizeof(char *));
+#ifdef HAVE_UNIX_SUEXEC
+	DT->suexec = apr_array_make(p, 0, sizeof(char *));
+#endif
+	
 	DT->aliases.recursion = -1;
 	DT->aliases.faketable = apr_table_make(p, 0);
 	
@@ -557,66 +636,80 @@ static void *domaintree_create_srv(apr_pool_t *p, server_rec *s)
 	DT->dircache.hmap = apr_hash_make(p);
 	apr_pool_create(&DT->dircache.pool, p);
 	apr_global_mutex_create(&DT->dircache.lock, __FILE__, APR_LOCK_DEFAULT, p);
-	
+#if DBG
+	fprintf(stderr, "MDT: cfg create %p\n", DT);
+#endif
 	return DT;
 }
 
 static void *domaintree_merge_srv(apr_pool_t *p, void *old_cfg_ptr, void *new_cfg_ptr)
 {
-	MDT_CNF *old_cfg = (MDT_CNF *) old_cfg_ptr;
-	MDT_CNF *new_cfg = (MDT_CNF *) new_cfg_ptr;
-	MDT_CNF *mrg_cfg = (MDT_CNF *) domaintree_create_srv(p, new_cfg->server);
-	
-	mrg_cfg->enabled = IF_SET_ELSE(new_cfg->enabled, old_cfg->enabled);
-	mrg_cfg->stripwww = IF_SET_ELSE(new_cfg->stripwww, old_cfg->stripwww);
-	mrg_cfg->statroot = IF_SET_ELSE(new_cfg->statroot, old_cfg->statroot);
-	mrg_cfg->maxdepth = IF_SET_ELSE(new_cfg->maxdepth, old_cfg->maxdepth);
-	
-	mrg_cfg->prefix = EMPTY(new_cfg->prefix) ? EMPTY(old_cfg->prefix) ? "/var/www" : old_cfg->prefix : new_cfg->prefix;
-	mrg_cfg->suffix = EMPTY(new_cfg->suffix) ? EMPTY(old_cfg->suffix) ? "public_html" : old_cfg->suffix : new_cfg->suffix;
+	MDT_CNF *old_cfg = (MDT_CNF *) old_cfg_ptr, *new_cfg = (MDT_CNF *) new_cfg_ptr;
+	MDT_CNF *DT = (MDT_CNF *) apr_palloc(p, sizeof(MDT_CNF));
+	
+	DT->server = new_cfg->server;
+	DT->enabled = IF_SET_ELSE(new_cfg->enabled, old_cfg->enabled);
+	DT->stripwww = IF_SET_ELSE(new_cfg->stripwww, old_cfg->stripwww);
+	DT->statroot = IF_SET_ELSE(new_cfg->statroot, old_cfg->statroot);
+	DT->maxdepth = IF_SET_ELSE(new_cfg->maxdepth, old_cfg->maxdepth);
+	
+	DT->prefix = EMPTY(new_cfg->prefix) ? EMPTY(old_cfg->prefix) ? "/var/www" : old_cfg->prefix : new_cfg->prefix;
+	DT->suffix = EMPTY(new_cfg->suffix) ? EMPTY(old_cfg->suffix) ? "public_html" : old_cfg->suffix : new_cfg->suffix;
+	
+	DT->ignore = apr_array_append(p, new_cfg->ignore, old_cfg->ignore);
+	DT->forbid = apr_array_append(p, new_cfg->forbid, old_cfg->forbid);
+#ifdef HAVE_UNIX_SUEXEC
+	DT->suexec = apr_array_append(p, new_cfg->suexec, old_cfg->suexec);
+#endif
 	
-	mrg_cfg->aliases.recursion = IF_SET_ELSE(new_cfg->aliases.recursion, old_cfg->aliases.recursion);
-	mrg_cfg->dircache.clim = IF_SET_ELSE(new_cfg->dircache.clim, old_cfg->dircache.clim);
+	DT->aliases.recursion = IF_SET_ELSE(new_cfg->aliases.recursion, old_cfg->aliases.recursion);
+	DT->aliases.faketable = apr_table_overlay(p, new_cfg->aliases.faketable, old_cfg->aliases.faketable);
 	
-	return mrg_cfg;
+	DT->dircache.clim = IF_SET_ELSE(new_cfg->dircache.clim, old_cfg->dircache.clim);
+	DT->dircache.hmap = apr_hash_overlay(p, new_cfg->dircache.hmap, old_cfg->dircache.hmap);
+	apr_global_mutex_create(&new_cfg->dircache.lock, __FILE__, APR_LOCK_DEFAULT, p);
+#if DBG
+	fprintf(stderr, "MDT: cfg merge  %p + %p = %p\n", old_cfg, new_cfg, DT);
+#endif
+	return DT;
 }
 
-static const char *domaintree_enable(cmd_parms *cmd, void *conf, int flag)
+static const char *domaintree_init_enable(cmd_parms *cmd, void *conf, int flag)
 {
 	GET_MDT_CNF(cmd->server)->enabled = flag;
 	return NULL;
 }
 
-static const char *domaintree_stripwww(cmd_parms *cmd, void *conf, int flag)
+static const char *domaintree_init_stripwww(cmd_parms *cmd, void *conf, int flag)
 {
 	GET_MDT_CNF(cmd->server)->stripwww = flag;
 	return NULL;
 }
 
-static const char *domaintree_statroot(cmd_parms *cmd, void *conf, int flag)
+static const char *domaintree_init_statroot(cmd_parms *cmd, void *conf, int flag)
 {
 	GET_MDT_CNF(cmd->server)->statroot = flag;
 	return NULL;
 }
 
-static const char *domaintree_prefix(cmd_parms *cmd, void *conf, const char *prefix)
+static const char *domaintree_init_prefix(cmd_parms *cmd, void *conf, const char *prefix)
 {
 	GET_MDT_CNF(cmd->server)->prefix = EMPTY(prefix) ? "/" : trim(apr_pstrdup(cmd->pool, prefix), strlen(prefix), '/', TRIM_RIGHT);
 	return NULL;
 }
 
-static const char *domaintree_suffix(cmd_parms *cmd, void *conf, const char *suffix)
+static const char *domaintree_init_suffix(cmd_parms *cmd, void *conf, const char *suffix)
 {
 	GET_MDT_CNF(cmd->server)->suffix = EMPTY(suffix) ? "" : trim(apr_pstrdup(cmd->pool, suffix), strlen(suffix), '/', TRIM_BOTH);
 	return NULL;
 }
 
-static const char *domaintree_maxdepth(cmd_parms *cmd, void *conf, const char *max_depth)
+static const char *domaintree_init_maxdepth(cmd_parms *cmd, void *conf, const char *max_depth)
 {
 	long depth;
 	
 	if ((depth = atol(max_depth))) {
-		if (depth > 0L) {
+		if (depth >= 0L) {
 			GET_MDT_CNF(cmd->server)->maxdepth = depth;
 		} else {
 			return "Maximum DomainTree depth cannot be negative.";
@@ -626,12 +719,12 @@ static const char *domaintree_maxdepth(cmd_parms *cmd, void *conf, const char *m
 	return NULL;
 }
 
-static const char *domaintree_aliasrecursion(cmd_parms *cmd, void *conf, const char *alias_recursion)
+static const char *domaintree_init_aliasrecursion(cmd_parms *cmd, void *conf, const char *alias_recursion)
 {
 	long recursion;
 	
 	if ((recursion = atol(alias_recursion))) {
-		if (recursion > 0L) {
+		if (recursion >= 0L) {
 			GET_MDT_CNF(cmd->server)->aliases.recursion = recursion;
 		} else {
 			return "DomainTree alias recursion cannot be negative.";
@@ -641,7 +734,7 @@ static const char *domaintree_aliasrecursion(cmd_parms *cmd, void *conf, const c
 	return NULL;
 }
 
-static const char *domaintree_alias(cmd_parms *cmd, void *conf, const char *fake, const char *real)
+static const char *domaintree_init_alias(cmd_parms *cmd, void *conf, const char *fake, const char *real)
 {
 	char *f = strtr(apr_pstrdup(cmd->pool, fake), '.', '/'), *r = strtr(apr_pstrdup(cmd->pool, real), '.', '/');
 	
@@ -650,12 +743,12 @@ static const char *domaintree_alias(cmd_parms *cmd, void *conf, const char *fake
 	return NULL;
 }
 
-static const char *domaintree_cache(cmd_parms *cmd, void *conf, const char *cache)
+static const char *domaintree_init_cache(cmd_parms *cmd, void *conf, const char *cache)
 {
 	long limit;
 	
 	if ((limit = atol(cache))) {
-		if (limit > 0L) {
+		if (limit >= 0L) {
 			GET_MDT_CNF(cmd->server)->dircache.clim = limit;
 		} else {
 			return "DomainTree cache limit cannot be negative.";
@@ -665,56 +758,108 @@ static const char *domaintree_cache(cmd_parms *cmd, void *conf, const char *cach
 	return NULL;
 }
 
+static const char *domaintree_init_ignore(cmd_parms *cmd, void *conf, const char *ignore)
+{
+	*((char **) apr_array_push(GET_MDT_CNF(cmd->server)->ignore)) = trim(apr_pstrdup(cmd->pool, ignore), strlen(ignore), '.', TRIM_BOTH);
+	return NULL;
+}
+
+static const char *domaintree_init_forbid(cmd_parms *cmd, void *conf, const char *forbid)
+{
+	*((char **) apr_array_push(GET_MDT_CNF(cmd->server)->forbid)) = trim(apr_pstrdup(cmd->pool, forbid), strlen(forbid), '.', TRIM_BOTH);
+	return NULL;
+}
+
+static const char *domaintree_init_suexec(cmd_parms *cmd, void *conf)
+{
+#ifdef HAVE_UNIX_SUEXEC
+	apr_finfo_t sb;
+	
+	if (!cmd->path) {
+		return "DomainTreeSuexec is a per directory configuration directive";
+	}
+	
+	switch (apr_stat(&sb, cmd->path, APR_FINFO_MIN, cmd->pool)) {
+		case APR_SUCCESS:
+		case APR_INCOMPLETE:
+			break;
+		default:
+			return "DomainTreeSuexec must be defined for an existing path";
+	}
+	
+	*((char **) apr_array_push(GET_MDT_CNF(cmd->server)->suexec)) = trim(apr_pstrdup(cmd->pool, cmd->path), strlen(cmd->path), '.', TRIM_BOTH);
+	
+	return NULL;
+#else
+	return "HAVE_UNIX_SUEXEC was undefined at compile time";
+#endif
+}
+
 /* }}} */
 /* {{{ Commands */
 
 static command_rec domaintree_commands[] = {
 	AP_INIT_FLAG(
-		"DomainTreeEnabled", domaintree_enable, NULL, RSRC_CONF,
+		"DomainTreeEnabled", domaintree_init_enable, NULL, RSRC_CONF,
 		"Turn the module on or off."
 	),
 
 	AP_INIT_FLAG(
-		"DomainTreeStripWWW", domaintree_stripwww, NULL, RSRC_CONF,
+		"DomainTreeStripWWW", domaintree_init_stripwww, NULL, RSRC_CONF,
 		"Strip leading www from host. (default On)"
 	),
 
 	AP_INIT_FLAG(
-		"DomainTreeStatRoot", domaintree_statroot, NULL, RSRC_CONF,
+		"DomainTreeStatRoot", domaintree_init_statroot, NULL, RSRC_CONF,
 		"Wheter to check for the evaluated virtual document root with a stat call. (default Off)"
 	),
 
 	AP_INIT_TAKE1(
-		"DomainTreePrefix", domaintree_prefix, NULL, RSRC_CONF,
+		"DomainTreePrefix", domaintree_init_prefix, NULL, RSRC_CONF,
 		"DomainTree path prefix. (default /var/www) Do not forget the leading slash!"
 	),
 
 	AP_INIT_TAKE1(
-		"DomainTreeSuffix", domaintree_suffix, NULL, RSRC_CONF,
+		"DomainTreeSuffix", domaintree_init_suffix, NULL, RSRC_CONF,
 		"DomainTree path suffix. (default public_html)"
 	),
 
 	AP_INIT_TAKE1(
-		"DomainTreeMaxdepth", domaintree_maxdepth, NULL, RSRC_CONF,
+		"DomainTreeMaxdepth", domaintree_init_maxdepth, NULL, RSRC_CONF,
 		"DomainTree max path depth. (default 20)"
 	),
 
 	AP_INIT_TAKE1(
-		"DomainTreeAliasRecursion", domaintree_aliasrecursion, NULL, RSRC_CONF,
+		"DomainTreeAliasRecursion", domaintree_init_aliasrecursion, NULL, RSRC_CONF,
 		"Whether (and how often at the maximum) DomainTree should walk recursively "
 		"through the aliases list as long as matching aliases are found. (default: 0 = turned off)"
 	),
 	
 	AP_INIT_TAKE2(
-		"DomainTreeAlias", domaintree_alias, NULL, RSRC_CONF,
+		"DomainTreeAlias", domaintree_init_alias, NULL, RSRC_CONF,
 		"DomainTree aliases; e.g. DomainTreeAlias com/example/tickets com/example/support (dots or slashes equal)"
 	),
 	
 	AP_INIT_TAKE1(
-		"DomainTreeCache", domaintree_cache, NULL, RSRC_CONF,
+		"DomainTreeCache", domaintree_init_cache, NULL, RSRC_CONF,
 		"DomainTree server-wide host to directory cache; specify how many cache entries to allow (default: 0 = turned off)"
 	),
 	
+	AP_INIT_ITERATE(
+		"DomainTreeIgnore", domaintree_init_ignore, NULL, RSRC_CONF,
+		"DomainTree ignored hosts; uses the same matching alogrithm like DomainTreeAlias"
+	),
+	
+	AP_INIT_ITERATE(
+		"DomainTreeForbid", domaintree_init_forbid, NULL, RSRC_CONF,
+		"DomanTree forbidden hosts; uses the same matching algorithm like DomainTreeAlias"
+	),
+	
+	AP_INIT_NO_ARGS(
+		"DomainTreeSuexec", domaintree_init_suexec, NULL, ACCESS_CONF,
+		"DomainTree user home directory; enable suexec hook for domain based user-dir hosting in this directory"
+	),
+	
 	{ NULL }
 };