mod_vhost_ldap: release 0.2.2, for changes see ChangeLog

git-svn-id: svn://svn.debian.org/svn/modvhostldap@4 4dd36cbf-e3fd-0310-983d-db0e06859cf4

diff --git a/ChangeLog b/ChangeLog
index 2359641f475b7c3631ca2c97fb6c4a9cc823e684..d910967a96a027f81ecf5069c45c32336db7b09d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-16 Ondřej Surý <ondrej@sury.org>
+       * Works even without scriptAlias defined
+       * Fixed schema, include apacheScriptAlias, change conflicting UIDs of attributes
+       * DOCUMENT_ROOT variable is set correctly
+       * Fixed some typos
+       * Release 0.2.2
+
 2005-08-02 Ondřej Surý <ondrej@sury.org>
        * Complete rewrite...
        * Change apacheUsername to apacheSuexecUid and apacheSuexecGid

diff --git a/mod_vhost_ldap.c b/mod_vhost_ldap.c
index 7988df1b4284f4ca0e79b50c008ef5e062d392de..4693368582c57350c9e13499a0a996eebf7cd9b4 100644 (file)
--- a/mod_vhost_ldap.c
+++ b/mod_vhost_ldap.c
@@ -20,6 +20,9 @@
  * mod_vhost_ldap.c --- read virtual host config from LDAP directory
  */
 
+#define CORE_PRIVATE
+#define MOD_VHOST_VERSION "mod_vhost_ldap/0.2.2"
+
 #include <unistd.h>
 
 #include "httpd.h"
@@ -79,7 +82,7 @@ typedef struct mod_vhost_ldap_request_t {
     char *name;                                /* ServerName */
     char *admin;                       /* ServerAdmin */
     char *docroot;                     /* DocumentRoot */
-    char *cgiroot;                     /* ScripAlias */
+    char *cgiroot;                     /* ScriptAlias */
     char *uid;                         /* Suexec Uid */
     char *gid;                         /* Suexec Gid */
 } mod_vhost_ldap_request_t;
@@ -98,7 +101,7 @@ static int mod_vhost_ldap_post_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_
 
     }
 
-    ap_add_version_component(p, "mod_vhost_ldap/0.2.1");
+    ap_add_version_component(p, MOD_VHOST_LDAP_VERSION);
 
     return OK;
 }
@@ -326,7 +329,8 @@ mod_vhost_ldap_translate_name (request_rec * r)
     char filtbuf[FILTER_LENGTH];
     mod_vhost_ldap_config_t *cfg =
        (mod_vhost_ldap_config_t *)ap_get_module_config(r->server->module_config, &vhost_ldap_module);
-
+    core_server_config * core =
+       (core_server_config *) ap_get_module_config(r->server->module_config, &core_module);
     util_ldap_connection_t *ldc = NULL;
     int result = 0;
     const char *dn = NULL;
@@ -427,17 +431,16 @@ start_over:
        if (cgi && (cgi != r->uri + strspn(r->parsed_uri.path, "/"))) {
            cgi = NULL;
        }
-    
-       if (cgi) {
-           r->filename =
-               apr_pstrcat (r->pool, req->cgiroot, cgi + strlen("cgi-bin"), NULL);
-           r->handler = "cgi-script";
-           apr_table_setn(r->notes, "alias-forced-type", r->handler);
-       } else {
-           
-           r->filename =
-               apr_pstrcat (r->pool, req->docroot, r->parsed_uri.path, NULL);
-       }
+    }
+
+    if (cgi) {
+       r->filename =
+           apr_pstrcat (r->pool, req->cgiroot, cgi + strlen("cgi-bin"), NULL);
+       r->handler = "cgi-script";
+       apr_table_setn(r->notes, "alias-forced-type", r->handler);
+    } else {
+       r->filename =
+           apr_pstrcat (r->pool, req->docroot, r->parsed_uri.path, NULL);
     }
 
     r->server->server_hostname = apr_pstrdup (r->pool, req->name);
@@ -450,6 +453,8 @@ start_over:
     e = r->subprocess_env;
     apr_table_addn (e, "SERVER_ROOT", req->docroot);
 
+    core->ap_document_root = apr_pstrdup(r->pool, req->docroot);
+
     ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r,
                  "[mod_vhost_ldap.c]: translated to %s", r->filename);
 

diff --git a/mod_vhost_ldap.schema b/mod_vhost_ldap.schema
index 82431409a53be5936184432206e4d0983ccb71f1..29279c48777c3511b1f46f0938108e3512a495f2 100644 (file)
--- a/mod_vhost_ldap.schema
+++ b/mod_vhost_ldap.schema
@@ -37,7 +37,15 @@ attributetype ( 1.3.6.1.4.1.8387.1.1.5 NAME 'apacheServerAdmin'
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256}
        SINGLE-VALUE )
 
-attributetype ( 1.3.6.1.4.1.8387.1.1.6 NAME 'apacheSuexecUid'
+attributetype ( 1.3.6.1.4.1.14287.1.1.6 NAME 'apacheScriptAlias'
+        SUP name
+        DESC 'mod_cfg_ldap: Apache ScriptAlias'
+        EQUALITY caseIgnoreMatch
+        SUBSTR caseIgnoreSubstringsMatch
+        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256}
+        SINGLE-VALUE )
+
+attributetype ( 1.3.6.1.4.1.8387.1.1.7 NAME 'apacheSuexecUid'
        SUP name
        DESC 'mod_vhost_ldap: Apache SuexecUid'
        EQUALITY caseIgnoreMatch
@@ -45,7 +53,7 @@ attributetype ( 1.3.6.1.4.1.8387.1.1.6 NAME 'apacheSuexecUid'
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15{256}
        SINGLE-VALUE )
 
-attributetype ( 1.3.6.1.4.1.8387.1.1.6 NAME 'apacheSuexecGid'
+attributetype ( 1.3.6.1.4.1.8387.1.1.8 NAME 'apacheSuexecGid'
        SUP name
        DESC 'mod_vhost_ldap: Apache SuexecGid'
        EQUALITY caseIgnoreMatch