diff options
| author | ghenry <ghenry@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-12 16:21:53 +0000 |
|---|---|---|
| committer | ghenry <ghenry@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-08-12 16:21:53 +0000 |
| commit | cc3aca8647d775514d11533ec445a6cc341da765 (patch) | |
| tree | a1b073995eb1579aa08a264f6b5d6157068521fd /contrib | |
| parent | 58eea662ee2e64af46370e685ba8118fc7737caf (diff) | |
Merged revisions 211767 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r211767 | ghenry | 2009-08-12 17:00:46 +0100 (Wed, 12 Aug 2009) | 33 lines
Added three new attributes and applied a patch to res_config_ldap.c
attributetype ( AstAccountSubscribeContext
NAME 'AstAccountSubscribeContext'
DESC 'Asterisk subscribe context'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
attributetype ( AstAccountIpAddr
NAME 'AstAccountIpAddr'
DESC 'Asterisk aaccount IP address'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
attributetype ( AstAccountUserAgent
NAME 'AstAccountUserAgent'
DESC 'Asterisk account user context'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
and patch fix_empty_attributes_1.6.1.4_v2.patch
(closes issue #13725)
Reported by: macogeek
Patches:
fix_empty_attributes_1.6.1.4_v2.patch uploaded by xvisor (license 863)
Tested by: suretec
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@211785 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/scripts/asterisk.ldap-schema | 37 | ||||
| -rw-r--r-- | contrib/scripts/asterisk.ldif | 27 |
2 files changed, 60 insertions, 4 deletions
diff --git a/contrib/scripts/asterisk.ldap-schema b/contrib/scripts/asterisk.ldap-schema index a1118ec40..3e7b3f526 100644 --- a/contrib/scripts/asterisk.ldap-schema +++ b/contrib/scripts/asterisk.ldap-schema @@ -1,9 +1,10 @@ # # Copyright (c) 2007-2009 Suretec Systems Ltd. - <http://www.suretecsystems.com/> # -# Version: 3.1.8 +# Version: 3.1.9 # # Changes: +# - 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 # - Added AstAccountLastQualifyMilliseconds - 28/05/2009 @@ -92,6 +93,9 @@ objectIdentifier AstVoicemailPager AstAttrType:55 objectIdentifier AstVoicemailOptions AstAttrType:56 objectIdentifier AstVoicemailTimestamp AstAttrType:57 objectIdentifier AstVoicemailContext AstAttrType:58 +objectIdentifier AstAccountSubscribeContext AstAttrType:59 +objectIdentifier AstAccountIpAddr AstAttrType:60 +objectIdentifier AstAccountUserAgent AstAttrType:61 ############################################################################# @@ -547,6 +551,27 @@ attributetype ( AstVoicemailContext SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) +attributetype ( AstAccountSubscribeContext + NAME 'AstAccountSubscribeContext' + DESC 'Asterisk subscribe context' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) + +attributetype ( AstAccountIpAddr + NAME 'AstAccountIpAddr' + DESC 'Asterisk aaccount IP address' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) + +attributetype ( AstAccountUserAgent + NAME 'AstAccountUserAgent' + DESC 'Asterisk account user context' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) + ############################################################################# # Object Class definitions # @@ -610,7 +635,10 @@ objectclass ( AsteriskIAXUser AstAccountNoTransfer $ AstAccountName $ AstAccountLastQualifyMilliseconds $ - AstAccountCallLimit + AstAccountCallLimit $ + AstAccountSubscribeContext $ + AstAccountIpAddr $ + AstAccountUserAgent ) ) @@ -656,7 +684,10 @@ objectclass ( AsteriskSIPUser AstAccountSecret $ AstAccountName $ AstAccountLastQualifyMilliseconds $ - AstAccountCallLimit + AstAccountCallLimit $ + AstAccountSubscribeContext $ + AstAccountIpAddr $ + AstAccountUserAgent ) ) diff --git a/contrib/scripts/asterisk.ldif b/contrib/scripts/asterisk.ldif index f159eb04f..897b9c146 100644 --- a/contrib/scripts/asterisk.ldif +++ b/contrib/scripts/asterisk.ldif @@ -1,9 +1,10 @@ # # Copyright (c) 2007-2009 Suretec Systems Ltd. - <http://www.suretecsystems.com/> # -# Version: 3.1.8 +# Version: 3.1.9 # # Changes: +# - 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 # - Added AstAccountLastQualifyMilliseconds - 28/05/2009 @@ -96,6 +97,9 @@ olcObjectIdentifier: AstVoicemailPager AstAttrType:55 olcObjectIdentifier: AstVoicemailOptions AstAttrType:56 olcObjectIdentifier: AstVoicemailTimestamp AstAttrType:57 olcObjectIdentifier: AstVoicemailContext AstAttrType:58 +olcObjectIdentifier: AstAccountSubscribeContext AstAttrType:59 +olcObjectIdentifier: AstAccountIpAddr AstAttrType:60 +olcObjectIdentifier: AstAccountUserAgent AstAttrType:61 # # ############################################################################# @@ -551,6 +555,27 @@ olcAttributeTypes: ( AstVoicemailContext SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) # +olcAttributeTypes: ( AstAccountSubscribeContext + NAME 'AstAccountSubscribeContext' + DESC 'Asterisk subscribe context' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) +# +olcAttributeTypes: ( AstAccountIpAddr + NAME 'AstAccountIpAddr' + DESC 'Asterisk aaccount IP address' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) +# +olcAttributeTypes: ( AstAccountUserAgent + NAME 'AstAccountUserAgent' + DESC 'Asterisk account user context' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) +# ############################################################################# # Object Class definitions # |