[asterisk-commits] lmadsen: branch 1.6.0 r172896 - in /branches/1.6.0: ./ configs/

[SVN commits to the Asterisk project]

Author: lmadsen
Date: Mon Feb  2 12:15:51 2009
New Revision: 172896

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=172896
Log:
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
........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/configs/res_ldap.conf.sample

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/configs/res_ldap.conf.sample
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/configs/res_ldap.conf.sample?view=diff&rev=172896&r1=172895&r2=172896
==============================================================================
--- branches/1.6.0/configs/res_ldap.conf.sample (original)
+++ branches/1.6.0/configs/res_ldap.conf.sample Mon Feb  2 12:15:51 2009
@@ -56,7 +56,7 @@
 ; Sip Users Table
 ;
 [sip]
-name = uid
+name = cn
 amaflags = AstAccountAMAFlags
 callgroup = AstAccountCallGroup
 callerid = AstAccountCallerID
@@ -91,7 +91,7 @@
 ipaddr = AstAccountIPAddress
 defaultuser = AstAccountDefaultUser
 regserver = AstAccountRegistrationServer
-additionalFilter=(objectClass=AstAccountSIP)
+additionalFilter=(objectClass=AsteriskSIPUser)
 
 ;
 ; IAX Users Table