diff options
author | ghenry <ghenry@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-28 11:18:09 +0000 |
---|---|---|
committer | ghenry <ghenry@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-05-28 11:18:09 +0000 |
commit | fefc5d661dcd7cec58edf5380d66879cc11ca688 (patch) | |
tree | 5f71b55cdc993518cd780cc1be6a4550edb7e26f | |
parent | b5285ba5aeab878d844e7cb344ea73ae83a34a52 (diff) |
New objectclass AsteriskVoiceMail and AstAccountCallLimit attribute
Added new ObjectClass AsteriskVoiceMail, and AstAccountCallLimit attribute
and cleaned up formatting and tested with OpenLDAP
(closes issue #15155)
Reported by: scramatte
Patches:
asterisk.schema uploaded by scramatte (license 796)
Tested by: suretec
Review: [full review board URL with trailing slash]
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@197409 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | contrib/scripts/asterisk.ldap-schema | 110 | ||||
-rw-r--r-- | contrib/scripts/asterisk.ldif | 139 |
2 files changed, 213 insertions, 36 deletions
diff --git a/contrib/scripts/asterisk.ldap-schema b/contrib/scripts/asterisk.ldap-schema index 7188e4a2f..f785ce8b2 100644 --- a/contrib/scripts/asterisk.ldap-schema +++ b/contrib/scripts/asterisk.ldap-schema @@ -1,9 +1,11 @@ # # Copyright (c) 2007-2009 Suretec Systems Ltd. - <http://www.suretecsystems.com/> # -# Version: 3.1.7 +# Version: 3.1.8 # # Changes: +# - Added AsteriskVoiceMail Object class and AstAccountCallLimit attribute - 28/05/2009 +# https://issues.asterisk.org/view.php?id=15155 # - Added AstAccountLastQualifyMilliseconds - 28/05/2009 # https://issues.asterisk.org/view.php?id=15156 # - http://bugs.digium.com/view.php?id=12860 - 04/07/2008 @@ -81,6 +83,15 @@ objectIdentifier AstAccountIPAddress AstAttrType:46 objectIdentifier AstAccountDefaultUser AstAttrType:47 objectIdentifier AstAccountRegistrationServer AstAttrType:48 objectIdentifier AstAccountLastQualifyMilliseconds AstAttrType:49 +objectIdentifier AstAccountCallLimit AstAttrType:50 +objectIdentifier AstVoicemailMailbox AstAttrType:51 +objectIdentifier AstVoicemailPassword AstAttrType:52 +objectIdentifier AstVoicemailFullname AstAttrType:53 +objectIdentifier AstVoicemailEmail AstAttrType:54 +objectIdentifier AstVoicemailPager AstAttrType:55 +objectIdentifier AstVoicemailOptions AstAttrType:56 +objectIdentifier AstVoicemailTimestamp AstAttrType:57 + ############################################################################# # Object Class OIDs @@ -90,6 +101,7 @@ objectIdentifier AsteriskExtension AstObjectClass:1 objectIdentifier AsteriskIAXUser AstObjectClass:2 objectIdentifier AsteriskSIPUser AstObjectClass:3 objectIdentifier AsteriskConfig AstObjectClass:4 +objectIdentifier AsteriskVoiceMail AstObjectClass:5 ############################################################################# @@ -465,11 +477,67 @@ attributetype ( AstAccountRegistrationServer SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) attributetype ( AstAccountLastQualifyMilliseconds - NAME 'AstAccountLastQualifyMilliseconds' - DESC 'Asterisk Account Last Qualify Milliseconds' - EQUALITY caseIgnoreMatch - SUBSTR caseIgnoreSubstringsMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) + NAME 'AstAccountLastQualifyMilliseconds' + DESC 'Asterisk Account Last Qualify Milliseconds' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) + +attributetype ( AstAccountCallLimit + NAME 'AstAccountCallLimit' + DESC 'Asterisk Account Call Limit' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) + +attributetype ( AstVoicemailMailbox + NAME 'AstVoicemailMailbox' + DESC 'Asterisk voicemail mailbox' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) + +attributetype ( AstVoicemailPassword + NAME 'AstVoicemailPassword' + DESC 'Asterisk voicemail password' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) + +attributetype ( AstVoicemailFullname + NAME 'AstVoicemailFullname' + DESC 'Asterisk voicemail fullname' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) + +attributetype ( AstVoicemailEmail + NAME 'AstVoicemailEmail' + DESC 'Asterisk voicemail email' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) + +attributetype ( AstVoicemailPager + NAME 'AstVoicemailPager' + DESC 'Asterisk voicemail pager' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) + +attributetype ( AstVoicemailOptions + NAME 'AstVoicemailOptions' + DESC 'Asterisk voicemail options' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) + +attributetype ( AstVoicemailTimestamp + NAME 'AstVoicemailTimestamp' + DESC 'Asterisk voicemail timestamp' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) ############################################################################# # Object Class definitions @@ -494,7 +562,8 @@ objectclass ( AsteriskExtension AstExtension $ AstPriority $ AstApplication $ - AstApplicationData + AstApplicationData $ + ) ) @@ -532,7 +601,8 @@ objectclass ( AsteriskIAXUser AstAccountRegistrationExten $ AstAccountNoTransfer $ AstAccountName $ - AstAccountLastQualifyMilliseconds + AstAccountLastQualifyMilliseconds $ + AstAccountCallLimit ) ) @@ -577,13 +647,14 @@ objectclass ( AsteriskSIPUser AstAccountCanCallForward $ AstAccountSecret $ AstAccountName $ - AstAccountLastQualifyMilliseconds + AstAccountLastQualifyMilliseconds $ + AstAccountCallLimit ) ) ############################################################################# # -# AsteriskIAXUser and AsteriskSIPUser extend AsteriskExtension. These +# AsteriskConfig and AsteriskVoiceMail extend AsteriskExtension. These # represent real accounts in Asterisk. # # NOTE: They are defined as AUXILIARY in case they need to be mixed with an @@ -605,3 +676,22 @@ objectclass ( AsteriskConfig AstConfigCommented ) ) + +objectclass ( AsteriskVoiceMail + NAME 'AsteriskVoiceMail' + DESC 'Asterisk voicemail information' + SUP top AUXILIARY + MUST ( + cn $ + AstContext $ + AstVoicemailMailbox $ + AstVoicemailPassword + ) + MAY ( + AstVoicemailFullname $ + AstVoicemailEmail $ + AstVoicemailPager $ + AstVoicemailOptions $ + AstVoicemailTimestamp + ) + ) diff --git a/contrib/scripts/asterisk.ldif b/contrib/scripts/asterisk.ldif index ee6965a6c..1932f7947 100644 --- a/contrib/scripts/asterisk.ldif +++ b/contrib/scripts/asterisk.ldif @@ -1,12 +1,13 @@ # # Copyright (c) 2007-2009 Suretec Systems Ltd. - <http://www.suretecsystems.com/> # -# Version: 3.1.7 +# Version: 3.1.8 # # Changes: +# - Added AsteriskVoiceMail Object class and AstAccountCallLimit attribute - 28/05/2009 +# https://issues.asterisk.org/view.php?id=15155 # - Added AstAccountLastQualifyMilliseconds - 28/05/2009 # https://issues.asterisk.org/view.php?id=15156 -# Also brought asterisk.ldif fully in synch with asterisk.ldap-schema # - http://bugs.digium.com/view.php?id=12860 - 04/07/2008 # - Fixed wrong DESC - 07/05/2008 # @@ -86,6 +87,14 @@ olcObjectIdentifier: AstAccountIPAddress AstAttrType:46 olcObjectIdentifier: AstAccountDefaultUser AstAttrType:47 olcObjectIdentifier: AstAccountRegistrationServer AstAttrType:48 olcObjectIdentifier: AstAccountLastQualifyMilliseconds AstAttrType:49 +olcObjectIdentifier: AstAccountCallLimit AstAttrType:50 +olcObjectIdentifier: AstVoicemailMailbox AstAttrType:51 +olcObjectIdentifier: AstVoicemailPassword AstAttrType:52 +olcObjectIdentifier: AstVoicemailFullname AstAttrType:53 +olcObjectIdentifier: AstVoicemailEmail AstAttrType:54 +olcObjectIdentifier: AstVoicemailPager AstAttrType:55 +olcObjectIdentifier: AstVoicemailOptions AstAttrType:56 +olcObjectIdentifier: AstVoicemailTimestamp AstAttrType:57 # # ############################################################################# @@ -96,6 +105,7 @@ olcObjectIdentifier: AsteriskExtension AstObjectClass:1 olcObjectIdentifier: AsteriskIAXUser AstObjectClass:2 olcObjectIdentifier: AsteriskSIPUser AstObjectClass:3 olcObjectIdentifier: AsteriskConfig AstObjectClass:4 +olcObjectIdentifier: AsteriskVoiceMail AstObjectClass:5 # # ############################################################################# @@ -450,32 +460,88 @@ olcAttributeTypes: ( AstConfigCommented SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) # olcAttributeTypes: ( AstAccountIPAddress - NAME 'AstAccountIPAddress' - DESC 'Asterisk Account IP Address' - EQUALITY caseIgnoreMatch - SUBSTR caseIgnoreSubstringsMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) -# + NAME 'AstAccountIPAddress' + DESC 'Asterisk Account IP Address' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) +# olcAttributeTypes: ( AstAccountDefaultUser - NAME 'AstAccountDefaultUser' - DESC 'Asterisk Account Default User' - EQUALITY caseIgnoreMatch - SUBSTR caseIgnoreSubstringsMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) + NAME 'AstAccountDefaultUser' + DESC 'Asterisk Account Default User' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) # olcAttributeTypes: ( AstAccountRegistrationServer - NAME 'AstAccountRegistrationServer' - DESC 'Asterisk Account Registration Server' - EQUALITY caseIgnoreMatch - SUBSTR caseIgnoreSubstringsMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) + NAME 'AstAccountRegistrationServer' + DESC 'Asterisk Account Registration Server' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) # olcAttributeTypes: ( AstAccountLastQualifyMilliseconds - NAME 'AstAccountLastQualifyMilliseconds' - DESC 'Asterisk Account Last Qualify Milliseconds' - EQUALITY caseIgnoreMatch - SUBSTR caseIgnoreSubstringsMatch - SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) + NAME 'AstAccountLastQualifyMilliseconds' + DESC 'Asterisk Account Last Qualify Milliseconds' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) +# +olcAttributeTypes: ( AstAccountCallLimit + NAME 'AstAccountCallLimit' + DESC 'Asterisk Account Call Limit' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) +# +olcAttributeTypes: ( AstVoicemailMailbox + NAME 'AstVoicemailMailbox' + DESC 'Asterisk voicemail mailbox' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) +# +olcAttributeTypes: ( AstVoicemailPassword + NAME 'AstVoicemailPassword' + DESC 'Asterisk voicemail password' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) +# +olcAttributeTypes: ( AstVoicemailFullname + NAME 'AstVoicemailFullname' + DESC 'Asterisk voicemail fullname' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) +# +olcAttributeTypes: ( AstVoicemailEmail + NAME 'AstVoicemailEmail' + DESC 'Asterisk voicemail email' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) +# +olcAttributeTypes: ( AstVoicemailPager + NAME 'AstVoicemailPager' + DESC 'Asterisk voicemail pager' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) +# +olcAttributeTypes: ( AstVoicemailOptions + NAME 'AstVoicemailOptions' + DESC 'Asterisk voicemail options' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) +# +olcAttributeTypes: ( AstVoicemailTimestamp + NAME 'AstVoicemailTimestamp' + DESC 'Asterisk voicemail timestamp' + EQUALITY caseIgnoreMatch + SUBSTR caseIgnoreSubstringsMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) # ############################################################################# # Object Class definitions @@ -538,7 +604,8 @@ olcObjectClasses: ( AsteriskIAXUser AstAccountRegistrationExten $ AstAccountNoTransfer $ AstAccountName $ - AstAccountLastQualifyMilliseconds + AstAccountLastQualifyMilliseconds $ + AstAccountCallLimit ) ) # @@ -583,13 +650,14 @@ olcObjectClasses: ( AsteriskSIPUser AstAccountCanCallForward $ AstAccountSecret $ AstAccountName $ - AstAccountLastQualifyMilliseconds + AstAccountLastQualifyMilliseconds $ + AstAccountCallLimit ) ) # ############################################################################# # -# AsteriskIAXUser and AsteriskSIPUser extend AsteriskExtension. These +# AsteriskConfig and AsteriskVoiceMail extend AsteriskExtension. These # represent real accounts in Asterisk. # # NOTE: They are defined as AUXILIARY in case they need to be mixed with an @@ -612,3 +680,22 @@ olcObjectClasses: ( AsteriskConfig ) ) # +olcObjectClasses: ( AsteriskVoiceMail + NAME 'AsteriskVoiceMail' + DESC 'Asterisk voicemail information' + SUP top AUXILIARY + MUST ( + cn $ + AstContext $ + AstVoicemailMailbox $ + AstVoicemailPassword + ) + MAY ( + AstVoicemailFullname $ + AstVoicemailEmail $ + AstVoicemailPager $ + AstVoicemailOptions $ + AstVoicemailTimestamp + ) + ) +# |