From: Leif Madsen Date: Thu, 21 Oct 2010 13:17:24 +0000 (+0000) Subject: Merged revisions 292557 via svnmerge from X-Git-Tag: 11.0.0-beta1~2177 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=da7d82e7832c81cf40a1d596d1878eb892e314aa;p=thirdparty%2Fasterisk.git 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) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@292559 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/configs/res_ldap.conf.sample b/configs/res_ldap.conf.sample index 7f2caeff14..ab4e7d9114 100644 --- a/configs/res_ldap.conf.sample +++ b/configs/res_ldap.conf.sample @@ -83,7 +83,7 @@ fullcontact = gecos 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 = AstAccountFullContact 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 @@ fullcontact = gecos 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