[svn-commits] lmadsen: trunk r292559 - in /trunk: ./ configs/res_ldap.conf.sample

[SVN commits to the Digium repositories]

Author: lmadsen
Date: Thu Oct 21 08:17:24 2010
New Revision: 292559

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=292559
Log:
Merged revisions 292557 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r292557 | lmadsen | 2010-10-21 08:12:19 -0500 (Thu, 21 Oct 2010) | 14 lines
  
  Merged revisions 292556 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r292556 | lmadsen | 2010-10-21 08:11:52 -0500 (Thu, 21 Oct 2010) | 6 lines
    
    Change res_ldap.sample.conf to match the schema.
    
    (closes issue #17376)
    Reported by: jcovert
    Patches:
          res_ldap.conf.sample.patch uploaded by jcovert (license 551)
  ........
................

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

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/configs/res_ldap.conf.sample
URL: http://svnview.digium.com/svn/asterisk/trunk/configs/res_ldap.conf.sample?view=diff&rev=292559&r1=292558&r2=292559
==============================================================================
--- trunk/configs/res_ldap.conf.sample (original)
+++ trunk/configs/res_ldap.conf.sample Thu Oct 21 08:17:24 2010
@@ -83,7 +83,7 @@
 host = AstAccountHost
 insecure = AstAccountInsecure
 mailbox = AstAccountMailbox
-md5secret = realmedPassword		; Must be an MD5 hash. Field value can start with
+md5secret = AstAccountRealmedPassword		; Must be an MD5 hash. Field value can start with
 					; {md5} but it is not required.
 nat = AstAccountNAT
 deny = AstAccountDeny
@@ -119,7 +119,7 @@
 fullcontact = gecos
 host = AstAccountHost
 mailbox = AstAccountMailbox
-md5secret = realmedPassword		; Must be an MD5 hash. Field value can start with
+md5secret = AstAccountRealmedPassword		; Must be an MD5 hash. Field value can start with
 					; {md5} but it is not required.
 deny = AstAccountDeny
 permit = AstAccountPermit
@@ -156,7 +156,7 @@
 host = AstAccountHost
 insecure = AstAccountInsecure
 mailbox = AstAccountMailbox
-md5secret = realmedPassword		; Must be an MD5 hash. Field value can start with
+md5secret = AstAccountRealmedPassword		; Must be an MD5 hash. Field value can start with
 					; {md5} but it is not required.
 nat = AstAccountNAT
 deny = AstAccountDeny