Merge branch 'upstream'

diff --git a/ChangeLog b/ChangeLog
index d910967a96a027f81ecf5069c45c32336db7b09d..e10247d9d01b7deba4c30d187230bd1caa1ac735 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-17 Ondřej Surý <ondrej@sury.org>
+       * Change off-by-one error in minimum UID/GID [courtesy of Fabian Fagerholm]
+       * Fix LDAP schema (at last) [courtesy of Fabian Fagerholm]
+       * Release 0.2.3
+
 2005-08-16 Ondřej Surý <ondrej@sury.org>
        * Works even without scriptAlias defined
        * Fixed schema, include apacheScriptAlias, change conflicting UIDs of attributes

diff --git a/mod_vhost_ldap.c b/mod_vhost_ldap.c
index d3faf6b7d63c11a3554f2cd46ca7e0c810c37af6..b1e57b6e433f53ea9df4299546145d7154f1de17 100644 (file)
--- a/mod_vhost_ldap.c
+++ b/mod_vhost_ldap.c
@@ -491,7 +491,7 @@ static ap_unix_identity_t *mod_vhost_ldap_get_suexec_id_doer(const request_rec *
   uid = (uid_t)atoll(req->uid);
   gid = (gid_t)atoll(req->gid);
 
-  if ((uid <= MIN_UID)||(gid <= MIN_GID)) {
+  if ((uid < MIN_UID)||(gid < MIN_GID)) {
       return NULL;
   }
 

diff --git a/mod_vhost_ldap.schema b/mod_vhost_ldap.schema
index 29279c48777c3511b1f46f0938108e3512a495f2..2f136fdcff506edd197baa5010a55c2e87f66ff9 100644 (file)
--- a/mod_vhost_ldap.schema
+++ b/mod_vhost_ldap.schema
@@ -64,4 +64,5 @@ attributetype ( 1.3.6.1.4.1.8387.1.1.8 NAME 'apacheSuexecGid'
 objectclass ( 1.3.6.1.4.1.8387.1.2.1 NAME 'apacheConfig'
        SUP 'top' AUXILIARY
        MUST ( apacheServerName $ apacheDocumentRoot )
-       MAY ( apacheServerAlias $ apacheServerAdmin ) )
+        MAY ( apacheServerAlias $ apacheServerAdmin $ apacheScriptAlias $
+                apacheSuexecUid $ apacheSuexecGid ) )