From: Gavin Henry Date: Thu, 13 Aug 2009 11:44:01 +0000 (+0000) Subject: Merged revisions 212027 via svnmerge from X-Git-Tag: 1.6.1.7-rc1~116 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b954f1ce87d0144fc09ab653038fde26669d12f0;p=thirdparty%2Fasterisk.git Merged revisions 212027 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r212027 | ghenry | 2009-08-13 12:37:12 +0100 (Thu, 13 Aug 2009) | 6 lines Fixed typo (closes issue #15710) Reported by: suretec ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@212029 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/contrib/scripts/asterisk.ldap-schema b/contrib/scripts/asterisk.ldap-schema index 3e7b3f5263..e86695f907 100644 --- a/contrib/scripts/asterisk.ldap-schema +++ b/contrib/scripts/asterisk.ldap-schema @@ -1,9 +1,10 @@ # # Copyright (c) 2007-2009 Suretec Systems Ltd. - # -# Version: 3.1.9 +# Version: 3.2.0 # # Changes: +# - Fixed typo - 13/08/2009 # - https://issues.asterisk.org/view.php?id=13725 - 12/08/2009 # - Added AsteriskVoiceMail Object class and AstAccountCallLimit attribute - 28/05/2009 # https://issues.asterisk.org/view.php?id=15155 @@ -595,8 +596,7 @@ objectclass ( AsteriskExtension AstExtension $ AstPriority $ AstApplication $ - AstApplicationData $ - + AstApplicationData ) ) @@ -630,7 +630,7 @@ objectclass ( AsteriskIAXUser AstAccountType $ AstAccountDisallowedCodec $ AstAccountExpirationTimestamp $ - AstAccountRegistrationContext$ + AstAccountRegistrationContext $ AstAccountRegistrationExten $ AstAccountNoTransfer $ AstAccountName $ diff --git a/contrib/scripts/asterisk.ldif b/contrib/scripts/asterisk.ldif index 897b9c146f..7286d90b11 100644 --- a/contrib/scripts/asterisk.ldif +++ b/contrib/scripts/asterisk.ldif @@ -1,9 +1,10 @@ # # Copyright (c) 2007-2009 Suretec Systems Ltd. - # -# Version: 3.1.9 +# Version: 3.2.0 # # Changes: +# - Fixed typo - 13/08/2009 # - https://issues.asterisk.org/view.php?id=13725 - 12/08/2009 # - Added AsteriskVoiceMail Object class and AstAccountCallLimit attribute - 28/05/2009 # https://issues.asterisk.org/view.php?id=15155 @@ -633,7 +634,7 @@ olcObjectClasses: ( AsteriskIAXUser AstAccountType $ AstAccountDisallowedCodec $ AstAccountExpirationTimestamp $ - AstAccountRegistrationContext$ + AstAccountRegistrationContext $ AstAccountRegistrationExten $ AstAccountNoTransfer $ AstAccountName $