This one's better, e.g., it works.

git-svn-id: svn://scripts.mit.edu/server/common/oursrc/httpdmods@674 db9d59ff-b01e-0410-9b1a-cd9a8c06840f

diff --git a/mod_vhost_ldap.c b/mod_vhost_ldap.c
index 0231979e38637266925b4615ce2ff4408b4854c0..87996a9c1820e900e9ed74bdc7df53f0e67d05ea 100644 (file)
--- a/mod_vhost_ldap.c
+++ b/mod_vhost_ldap.c
@@ -419,32 +419,23 @@ command_rec mod_vhost_ldap_cmds[] = {
     {NULL}
 };
 
-char* mod_vhost_ldap_sanitize(apr_pool_t* p, const char* source) {
-    char* target = apr_palloc(p, 3*strlen(source)+1);
+char *mod_vhost_ldap_escape(apr_pool_t *p, const char *source)
+{
+    char *target = apr_palloc(p, 3 * strlen(source) + 1);
+    char *result = target;
     for (; *source; source++) {
        switch (*source) {
-           case '*':
-               strcpy(target, "\\2a");
-               target += 3;
-               break;
-           case '(':
-               strcpy(target, "\\28");
-               target += 3;
-               break;
-           case ')':
-               strcpy(target, "\\29");
-               target += 3;
-               break;
-           case '\\':
-               strcpy(target, "\\5c");
+           case '*': case '(': case ')': case '\\':
+               sprintf(target, "\\%02hhx", *source);
                target += 3;
                break;
            default:
                *target++ = *source;
+               break;
        }
     }
     *target = '\0';
-    return target;
+    return result;
 }
 
 #define FILTER_LENGTH MAX_STRING_LEN
@@ -498,7 +489,7 @@ fallback:
     ap_log_rerror(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r,
                   "[mod_vhost_ldap.c]: translating %s", r->uri);
 
-    s_hostname = mod_vhost_ldap_sanitize(r->pool, hostname);
+    s_hostname = mod_vhost_ldap_escape(r->pool, hostname);
     apr_snprintf(filtbuf, FILTER_LENGTH, "(&(%s)(|(apacheServerName=%s)(apacheServerAlias=%s)))", conf->filter, s_hostname, s_hostname);
 
     result = util_ldap_cache_getuserdn(r, ldc, conf->url, conf->basedn, conf->scope,