Add more debug info

[mod-vhost-ldap.git] / mod_vhost_ldap.c

diff --git a/mod_vhost_ldap.c b/mod_vhost_ldap.c
index af080871dd85d74c2ed573b5c2ed61dd5adb29c2..97671af4d90001cfe92116cbcde5a6f2169199fc 100644 (file)
--- a/mod_vhost_ldap.c
+++ b/mod_vhost_ldap.c
@@ -470,7 +470,7 @@ static int mod_vhost_ldap_translate_name(request_rec *r)
     util_ldap_connection_t *ldc = NULL;
     int result = 0;
     const char *dn = NULL;
-    char *cgi;
+    char *cgi, *real;
     const char *hostname = NULL;
     int is_fallback = 0;
 
@@ -625,19 +625,23 @@ fallback:
        top->server->server_admin = apr_pstrdup (top->pool, reqc->admin);
     }
 
+    real = apr_pstrcat(r->pool, reqc->docroot, r->uri);
+
     ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r,
-                 "[mod_vhost_ldap.c]: ap_server_root_relative(%s) is: %s", r->filename, ap_server_root_relative(r->pool, r->filename));
+                 "[mod_vhost_ldap.c]: ap_server_root_relative(%s) is: %s", real, ap_server_root_relative(r->pool, real));
 
     ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r,
                  "[mod_vhost_ldap.c]: ap_document_root is: %s", ap_document_root(r));
 
     reqc->saved_docroot = apr_pstrdup(top->pool, ap_document_root(r));
 
-    if (set_document_root(r, NULL, reqc->docroot) != OK)
+    if (set_document_root(r, reqc->docroot) != OK)
         return HTTP_INTERNAL_SERVER_ERROR;
 
     ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r,
-                 "[mod_vhost_ldap.c]: ap_document_root set to: %s", ap_document_root(r));
+                 "[mod_vhost_ldap.c]: ap_document_root set to: [%s], relative [%s]",
+                 ap_document_root(r),
+                 ap_server_root_relative(r->pool, real));
 
     // set environment variables
     e = top->subprocess_env;
@@ -654,7 +658,7 @@ static int mod_vhost_ldap_cleanup(request_rec * r)
       (mod_vhost_ldap_request_t *)ap_get_module_config(r->request_config,
                                                       &vhost_ldap_module);
 
-    if (set_document_root(r, NULL, reqc->docroot) != OK)
+    if (set_document_root(r, reqc->saved_docroot) != OK)
         return HTTP_INTERNAL_SERVER_ERROR;
 
     ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r,