about'>summary'>refslog'>treecommit'>diffstats
'>
diff options
context:
space:
mode:
authorKees Monshouwer <mind04@monshouwer.org>2013-06-14 20:23:33 +0200
committermind04 <mind04@monshouwer.org>2013-06-14 20:23:33 +0200
commit6d33794a7e907b64ef1e15006e527c03f7e6a1b9 ( ('>patch)
tree'>24156d0952ebe6bedc0a071767e2494e374fc75e
parentRemove apache http server subcomponents from LICENSE ( ('>diff)
downloadmod_ruid2-6d33794a7e907b64ef1e15006e527c03f7e6a1b9.tar.gz
Fix 'RGroups @none' in config mode, thanks Piotr Goczal for reporting
-rw-r--r--mod_ruid2.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/mod_ruid2.c b/mod_ruid2.c
index 2db7cf8..30d81b2 100644
--- a/mod_ruid2.c
+++ b/mod_ruid2.c
@@ -154,7 +154,9 @@ static void *merge_dir_config(apr_pool_t *p, void *base, void *overrides)
} else {
conf->ruid_uid = (child->ruid_uid == UNSET) ? parent->ruid_uid : child->ruid_uid;
conf->ruid_gid = (child->ruid_gid == UNSET) ? parent->ruid_gid : child->ruid_gid;
- if (child->groupsnr > 0) {
+ if (child->groupsnr == NONE) {
+ conf->groupsnr = NONE;
+ } else if (child->groupsnr > 0) {
memcpy(conf->groups, child->groups, sizeof(child->groups));
conf->groupsnr = child->groupsnr;
} else if (parent->groupsnr > 0) {