Merged revisions 172894 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r172894 | lmadsen | 2009-02-02 13:13:40 -0500 (Mon, 02 Feb 2009) | 7 lines
  
  Update the res_ldap.conf file with a better working example.
  
  (closes issue #13861)
  Reported by: scramatte
  Patches:
        __20080110-res_ldap.conf-2.patch uploaded by blitzrage (license 10)
  Tested by: jcovert
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@172896 65c4cc65-6c06-0410-ace0-fbb531ad65f3

configs/res_ldap.conf.sample

@@ -56,7 +56,7 @@ additionalFilter=(objectClass=AstExtension)
 ; Sip Users Table
 ;
 [sip]
-name = uid
+name = cn
 amaflags = AstAccountAMAFlags
 callgroup = AstAccountCallGroup
 callerid = AstAccountCallerID
@@ -91,7 +91,7 @@ CanCallForward = AstAccountCanCallForward
 ipaddr = AstAccountIPAddress
 defaultuser = AstAccountDefaultUser
 regserver = AstAccountRegistrationServer
-additionalFilter=(objectClass=AstAccountSIP)
+additionalFilter=(objectClass=AsteriskSIPUser)
 
 ;
 ; IAX Users Table