[svn-commits] tilghman: branch 1.6.0 r148124 - in /branches/1.6.0: ./ configs/

[SVN commits to the Digium repositories]

Author: tilghman
Date: Thu Oct  9 18:26:42 2008
New Revision: 148124

URL: http://svn.digium.com/view/asterisk?view=rev&rev=148124
Log:
Merged revisions 148120 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r148120 | tilghman | 2008-10-09 18:25:53 -0500 (Thu, 09 Oct 2008) | 6 lines
  
  Fix example schema
  (closes issue #12860)
   Reported by: flyn
   Patches: 
         res_ldap.conf.patch uploaded by flyn (license 503)
........

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/view/asterisk/branches/1.6.0/configs/res_ldap.conf.sample?view=diff&rev=148124&r1=148123&r2=148124
==============================================================================
--- branches/1.6.0/configs/res_ldap.conf.sample (original)
+++ branches/1.6.0/configs/res_ldap.conf.sample Thu Oct  9 18:26:42 2008
@@ -88,6 +88,9 @@
 regcontext = AstAccountRegistrationContext
 regexten = AstAccountRegistrationExten
 CanCallForward = AstAccountCanCallForward
+ipaddr = AstAccountIPAddress
+defaultuser = AstAccountDefaultUser
+regserver = AstAccountRegistrationServer
 additionalFilter=(objectClass=AstAccountSIP)
 
 ;