From c09f1ef5c45ae82bfc53473fb4ee4221d1a73e09 Mon Sep 17 00:00:00 2001 From: Michael Wallner Date: Mon, 7 May 2007 09:42:15 +0000 Subject: [PATCH] - fix unixd.h include - fix return value type of suexec hook --- mod_domaintree.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mod_domaintree.c b/mod_domaintree.c index 96d955f..c0ddc06 100644 --- a/mod_domaintree.c +++ b/mod_domaintree.c @@ -31,7 +31,8 @@ * DomainTreeAlias /*one/ /anyone/ * DomainTreeIgnore *.foo.com *.foo.co.uk * DomainTreeForbid html.* - * + * + * # e.g. a symlink to /home * DomainTreeSuexec * * @@ -143,7 +144,7 @@ typedef struct { apr_global_mutex_t *lock; } dircache_t; -typedef apr_array_header_t *hostlist_t; +typedef apr_array_header_t *hostlist_t, *pathlist_t; typedef struct { server_rec *server; @@ -158,7 +159,7 @@ typedef struct { hostlist_t ignore; hostlist_t forbid; #ifdef HAVE_UNIX_SUEXEC - hostlist_t suexec; + pathlist_t suexec; #endif } domaintree_conf; @@ -577,7 +578,7 @@ static STATUS domaintree_hook_translate_name(request_rec *r) } #ifdef HAVE_UNIX_SUEXEC -static STATUS domaintree_hook_get_suexec_identity(const request_rec *r) +static ap_unix_identity_t *domaintree_hook_get_suexec_identity(const request_rec *r) { ap_unix_identity_t *ugid = NULL; #if APR_HAS_USER -- 2.30.2