[asterisk-commits] lmadsen: trunk r289337 - in /trunk: ./ configs/res_ldap.conf.sample

[SVN commits to the Asterisk project]

Author: lmadsen
Date: Wed Sep 29 15:29:11 2010
New Revision: 289337

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

................
  r289336 | lmadsen | 2010-09-29 15:27:25 -0500 (Wed, 29 Sep 2010) | 9 lines
  
  Merged revisions 289334 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r289334 | lmadsen | 2010-09-29 15:24:47 -0500 (Wed, 29 Sep 2010) | 1 line
    
    Update sample documentation to note md5secret requirements.
  ........
................

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=289337&r1=289336&r2=289337
==============================================================================
--- trunk/configs/res_ldap.conf.sample (original)
+++ trunk/configs/res_ldap.conf.sample Wed Sep 29 15:29:11 2010
@@ -83,7 +83,8 @@
 host = AstAccountHost
 insecure = AstAccountInsecure
 mailbox = AstAccountMailbox
-md5secret = realmedPassword
+md5secret = realmedPassword		; Must be an MD5 hash. Field value can start with
+					; {md5} but it is not required.
 nat = AstAccountNAT
 deny = AstAccountDeny
 permit = AstAccountPermit
@@ -118,7 +119,8 @@
 fullcontact = gecos
 host = AstAccountHost
 mailbox = AstAccountMailbox
-md5secret = realmedPassword
+md5secret = realmedPassword		; Must be an MD5 hash. Field value can start with
+					; {md5} but it is not required.
 deny = AstAccountDeny
 permit = AstAccountPermit
 port = AstAccountPort
@@ -154,7 +156,8 @@
 host = AstAccountHost
 insecure = AstAccountInsecure
 mailbox = AstAccountMailbox
-md5secret = realmedPassword
+md5secret = realmedPassword		; Must be an MD5 hash. Field value can start with
+					; {md5} but it is not required.
 nat = AstAccountNAT
 deny = AstAccountDeny
 permit = AstAccountPermit