From 06c171fb1c212dd5d8b00a121e5427d23e830d39 Mon Sep 17 00:00:00 2001
From: Leif Madsen <leif@leifmadsen.com>
Date: Wed, 29 Sep 2010 20:29:11 +0000
Subject: [PATCH] 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.
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@289337 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 configs/res_ldap.conf.sample | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/configs/res_ldap.conf.sample b/configs/res_ldap.conf.sample
index 6d5e832ba0..7f2caeff14 100644
--- a/configs/res_ldap.conf.sample
+++ b/configs/res_ldap.conf.sample
@@ -83,7 +83,8 @@ fullcontact = gecos
 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 = AstAccountFullContact
 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 @@ fullcontact = gecos
 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
-- 
GitLab