steffen: server/kolab/kolab/templates httpd.conf.template, 1.12, 1.13

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolab/kolab/templates
In directory doto:/tmp/cvs-serv7828/kolab/kolab/templates

Modified Files:
	httpd.conf.template 
Log Message:
fix for issue306 (apache mod_auth_ldap uid/mail problem)

Index: httpd.conf.template
===================================================================
RCS file: /kolabrepository/server/kolab/kolab/templates/httpd.conf.template,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- httpd.conf.template	5 Oct 2004 10:08:51 -0000	1.12
+++ httpd.conf.template	13 Oct 2004 01:55:29 -0000	1.13
@@ -204,7 +204,7 @@
    # need to investigate ...
    Bind_DN "@@@php_dn@@@"
    Bind_Pass "@@@php_pw@@@"
-   UID_Attr uid
+   UID_Filter "(|(uid=%u)(mail=%u))"
    DavMinTimeout 600
    AddDefaultCharset Off  
 </Directory>
@@ -231,7 +231,7 @@
    # need to investigate ...
    Bind_DN "@@@php_dn@@@"
    Bind_Pass "@@@php_pw@@@"
-   UID_Attr uid
+   UID_Filter "(|(uid=%u)(mail=%u))"
    DavMinTimeout 600
    AddDefaultCharset Off
 </Directory>
@@ -257,7 +257,7 @@
    # need to investigate ...
    Bind_DN "@@@php_dn@@@"
    Bind_Pass "@@@php_pw@@@"
-   UID_Attr uid
+   UID_Filter "(|(uid=%u)(mail=%u))"
    DavMinTimeout 600
    AddDefaultCharset Off
 </Directory>