diff --git a/branches/ucs-3.2/ucs-3.2-0/management/univention-ldap/conffiles/etc/ldap/slapd.conf.d/60univention-ldap-server_acl-master b/branches/ucs-3.2/ucs-3.2-0/management/univention-ldap/conffiles/etc/ldap/slapd.conf.d/60univention-ldap-server_acl-master index 8e45bde..3a0dbea 100644 --- a/branches/ucs-3.2/ucs-3.2-0/management/univention-ldap/conffiles/etc/ldap/slapd.conf.d/60univention-ldap-server_acl-master +++ b/branches/ucs-3.2/ucs-3.2-0/management/univention-ldap/conffiles/etc/ldap/slapd.conf.d/60univention-ldap-server_acl-master @@ -6,9 +6,9 @@ if baseConfig['ldap/server/type']=="master": else: usr="read" -print 'sasl-regexp' +print 'authz-regexp' print ' uid=(.*),cn=gssapi,cn=auth' -print ' ldap://0.0.0.0:%s/"%s"??sub?uid=$1' % (ldap_port, ldap_base) +print ' ldap:///%s??sub?uid=$1' % (ldap_base,) print print 'access to attrs=userPassword' diff --git a/branches/ucs-3.2/ucs-3.2-0/management/univention-ldap/conffiles/etc/ldap/slapd.conf.d/60univention-ldap-server_acl-slave b/branches/ucs-3.2/ucs-3.2-0/management/univention-ldap/conffiles/etc/ldap/slapd.conf.d/60univention-ldap-server_acl-slave index b156e95..cedb57f 100644 --- a/branches/ucs-3.2/ucs-3.2-0/management/univention-ldap/conffiles/etc/ldap/slapd.conf.d/60univention-ldap-server_acl-slave +++ b/branches/ucs-3.2/ucs-3.2-0/management/univention-ldap/conffiles/etc/ldap/slapd.conf.d/60univention-ldap-server_acl-slave @@ -1,6 +1,6 @@ -sasl-regexp +authz-regexp uid=(.*),cn=gssapi,cn=auth - ldap:///"@%@ldap/base@%@"??sub?uid=$1 + ldap:///@%@ldap/base@%@??sub?uid=$1 # allow authentication access to attrs=userPassword diff --git a/branches/ucs-3.2/ucs-3.2-0/management/univention-ldap/conffiles/etc/ldap/slapd.conf.d/70univention-ldap-server_acl-master-end b/branches/ucs-3.2/ucs-3.2-0/management/univention-ldap/conffiles/etc/ldap/slapd.conf.d/70univention-ldap-server_acl-master-end index 0b1f5b7..cb56ee0 100644 --- a/branches/ucs-3.2/ucs-3.2-0/management/univention-ldap/conffiles/etc/ldap/slapd.conf.d/70univention-ldap-server_acl-master-end +++ b/branches/ucs-3.2/ucs-3.2-0/management/univention-ldap/conffiles/etc/ldap/slapd.conf.d/70univention-ldap-server_acl-master-end @@ -148,6 +148,7 @@ if configRegistry.is_false('ldap/acl/read/anonymous'): if ldap_acl_read_anonymous_ips: for ip in ldap_acl_read_anonymous_ips.split(','): print ' by peername.ip=%s read' % ip + print ' by anonymous auth' else: print ' by * read'