X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Flibldap%2Fldapfilter.conf;h=fad388e4d8a1a01619180566d9ca555662b95a44;hb=96483c8dcd426dcdc85c77f1597c8a3d03faa621;hp=c602f7d2e716dc5331a8598e1f92d27a249a44a6;hpb=42e0d83cb3a1a1c5b25183f1ab74ce7edbe25de7;p=openldap

diff --git a/libraries/libldap/ldapfilter.conf b/libraries/libldap/ldapfilter.conf
index c602f7d2e7..fad388e4d8 100644
--- a/libraries/libldap/ldapfilter.conf
+++ b/libraries/libldap/ldapfilter.conf
@@ -1,3 +1,5 @@
+# $OpenLDAP$
+#
 # ldap filter file
 #
 # lines like this that start with # or empty lines are ignored
@@ -24,33 +26,35 @@
 #
 
 "finger and ud and go500 and go500gw subtree and web500gw subtree and rp500 and rcpt500 and ufn last"
+    "^$"    ""  "(objectclass=*)"   "default filter"
     "="		" "	"%v"				"arbitrary filter"
 
-    "^[0-9][0-9-]*$"	" "	"(telephoneNumber=*%v)"	"phone number"
+    "^[0-9][0-9\-]*$"	" "	"(telephoneNumber=*%v)"		"phone number"
 
     "@"		" "	"(mail=%v)"			"email address"
 			"(mail=%v*)"			"start of email address"
 
-    "^.[. _].*"	". _"	"(cn=%v1* %v2-)"		"first initial"
+    "^.[\. _].*"	". _"	"(cn=%v1* %v2-)"		"first initial"
 
     ".*[. _].$"	". _"	"(cn=%v1-*)"			"last initial"
 
     "[. _]"	". _"	"(|(sn=%v1-)(cn=%v1-))"		"exact"
 			"(|(sn~=%v1-)(cn~=%v1-))"	"approximate"
 
-    ".*"	". "	"(|(cn=%v1)(sn=%v1)(uid=%v1))"	"exact"
-			"(|(cn~=%v1)(sn~=%v1))"		"approximate"
+    ".*"	". "	"(|(cn=%v1)(sn=%v1)(ou=%v1))"	"exact"
+			"(|(cn~=%v1)(sn~=%v1)(ou~=%v1))"	"approximate"
 
 "go500gw onelevel and web500gw onelevel and ufn first and ufn intermediate"
+    "^$"    ""  "(!(objectclass=dSA))"   "default filter"
     "="		" "	"%v"				"arbitrary filter"
 
-    "^..$"	" "	"(|(o=%v)(c=%v)(l=%v)(co=%v))"		"exact"
-    			"(|(o~=%v)(c~=%v)(l~=%v)(co~=%v))"	"approximate"
+    "^..$"	" "	"(|(o=%v)(c=%v)(l=%v)(co=%v))"		"exact2"
+    			"(|(o~=%v)(c~=%v)(l~=%v)(co~=%v))"	"approximate2"
 
     " "		" "	"(|(o=%v)(l=%v)(co=%v)(ou=%v))"		"exact"
     			"(|(o~=%v)(l~=%v)(co~=%v)(ou~=%v))"	"approximate"
 
-    "\."	" "	"(associatedDomain=%v)"			"exact"
+    "\."	" "	"(associatedDomain=%v)"		"exact"
 
     ".*"	" "	"(|(o=%v)(l=%v)(co=%v)(ou=%v))"		"exact"
     			"(|(o~=%v)(l~=%v)(co~=%v)(ou~=%v))"	"approximate"