aboutsummaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorlmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>2010-10-22 21:28:43 +0000
committerlmadsen <lmadsen@f38db490-d61c-443f-a65b-d21fe96a405b>2010-10-22 21:28:43 +0000
commit497ce3d7b0e70d8ebda42d364eb1803cb652c282 (patch)
treeee9a2377f89dcab7504c4e9657de389db9e90101 /contrib
parent1b10edb79b2dc27cf96d8264d0aeec58e567caf6 (diff)
Merged revisions 292786 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2 ........ r292786 | lmadsen | 2010-10-22 16:16:12 -0500 (Fri, 22 Oct 2010) | 13 lines Update the LDIF file for LDAP. The LDIF file asterisk.ldif was quite a bit out of date from the asterisk.ldap-schema file, so I've now updated that to be in sync. The asterisk.ldif file being out of sync was a problem on my systems where I was doing an ldapadd to import the schema into the LDAP database, and the existing file would cause problems and ERROR messages when registering. Additional documention has been added based on feedback in the issue I'm closing. (closes issue #13861) Reported by: scramatte Patches: ldap-update.txt uploaded by lmadsen (license 10) Tested by: lmadsen, jcovert, suretec, rgenthner ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@292787 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'contrib')
-rw-r--r--contrib/scripts/asterisk.ldif171
1 files changed, 135 insertions, 36 deletions
diff --git a/contrib/scripts/asterisk.ldif b/contrib/scripts/asterisk.ldif
index 8f2453d3a..0546cdd7c 100644
--- a/contrib/scripts/asterisk.ldif
+++ b/contrib/scripts/asterisk.ldif
@@ -99,8 +99,15 @@ olcObjectIdentifier: AstVoicemailOptions AstAttrType:56
olcObjectIdentifier: AstVoicemailTimestamp AstAttrType:57
olcObjectIdentifier: AstVoicemailContext AstAttrType:58
olcObjectIdentifier: AstAccountSubscribeContext AstAttrType:59
-olcObjectIdentifier: AstAccountIpAddr AstAttrType:60
olcObjectIdentifier: AstAccountUserAgent AstAttrType:61
+olcObjectIdentifier: AstAccountLanguage AstAttrType:62
+olcObjectIdentifier: AstAccountTransport AstAttrType:63
+olcObjectIdentifier: AstAccountPromiscRedir AstAttrType:64
+olcObjectIdentifier: AstAccountAccountCode AstAttrType:65
+olcObjectIdentifier: AstAccountSetVar AstAttrType:66
+olcObjectIdentifier: AstAccountAllowOverlap AstAttrType:67
+olcObjectIdentifier: AstAccountVideoSupport AstAttrType:68
+olcObjectIdentifier: AstAccountIgnoreSDPVersion AstAttrType:69
#
#
#############################################################################
@@ -112,6 +119,9 @@ olcObjectIdentifier: AsteriskIAXUser AstObjectClass:2
olcObjectIdentifier: AsteriskSIPUser AstObjectClass:3
olcObjectIdentifier: AsteriskConfig AstObjectClass:4
olcObjectIdentifier: AsteriskVoiceMail AstObjectClass:5
+olcObjectIdentifier: AsteriskDialplan AstObjectClass:6
+olcObjectIdentifier: AsteriskAccount AstObjectClass:7
+olcObjectIdentifier: AsteriskMailbox AstObjectClass:8
#
#
#############################################################################
@@ -563,16 +573,65 @@ olcAttributeTypes: ( AstAccountSubscribeContext
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
#
-olcAttributeTypes: ( AstAccountIpAddr
- NAME 'AstAccountIpAddr'
- DESC 'Asterisk aaccount IP address'
+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)
#
-olcAttributeTypes: ( AstAccountUserAgent
- NAME 'AstAccountUserAgent'
- DESC 'Asterisk account user context'
+olcAttributeTypes: ( AstAccountLanguage
+ NAME 'AstAccountLanguage'
+ DESC 'Asterisk account user language'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
+#
+olcAttributeTypes: ( AstAccountTransport
+ NAME 'AstAccountTransport'
+ DESC 'Asterisk account transport type'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
+#
+olcAttributeTypes: ( AstAccountPromiscRedir
+ NAME 'AstAccountPromiscRedir'
+ DESC 'Asterisk account promiscous redirects'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
+#
+olcAttributeTypes: ( AstAccountAccountCode
+ NAME 'AstAccountAccountCode'
+ DESC 'Asterisk account billing code'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
+#
+olcAttributeTypes: ( AstAccountSetVar
+ NAME 'AstAccountSetVar'
+ DESC 'Asterisk account setvar'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
+#
+olcAttributeTypes: ( AstAccountAllowOverlap
+ NAME 'AstAccountAllowOverlap'
+ DESC 'Asterisk account allow overlap dialing'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
+#
+olcAttributeTypes: ( AstAccountVideoSupport
+ NAME 'AstAccountVideoSupport'
+ DESC 'Asterisk account video support'
+ EQUALITY caseIgnoreMatch
+ SUBSTR caseIgnoreSubstringsMatch
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
+#
+olcAttributeTypes: ( AstAccountIgnoreSDPVersion
+ NAME 'AstAccountIgnoreSDPVersion'
+ DESC 'Asterisk account ignore SDP version'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
@@ -632,6 +691,7 @@ olcObjectClasses: ( AsteriskIAXUser
AstAccountPort $
AstAccountQualify $
AstAccountType $
+ AstAccountLanguage $
AstAccountDisallowedCodec $
AstAccountExpirationTimestamp $
AstAccountRegistrationContext $
@@ -639,7 +699,10 @@ olcObjectClasses: ( AsteriskIAXUser
AstAccountNoTransfer $
AstAccountName $
AstAccountLastQualifyMilliseconds $
- AstAccountCallLimit
+ AstAccountCallLimit $
+ AstAccountSubscribeContext $
+ AstAccountIPAddress $
+ AstAccountUserAgent
)
)
#
@@ -649,43 +712,53 @@ olcObjectClasses: ( AsteriskSIPUser
SUP AsteriskExtension AUXILIARY
MUST cn
MAY (
- AstAccountAMAFlags $
- AstAccountCallGroup $
- AstAccountCallerID $
+ AstAccountAccountCode $
+ AstAccountAllowOverlap $
+ AstAccountAllowedCodec $
+ AstAccountAMAFlags $
+ AstAccountCallGroup $
+ AstAccountCallLimit $
+ AstAccountCallerID $
+ AstAccountCanCallForward $
AstAccountCanReinvite $
AstAccountContext $
+ AstAccountDTMFMode $
AstAccountDefaultUser $
- AstAccountDTMFMode $
- AstAccountFromUser $
- AstAccountFromDomain $
- AstAccountFullContact $
- AstAccountHost $
- AstAccountInsecure $
+ AstAccountDeny $
+ AstAccountDisallowedCodec $
+ AstAccountExpirationTimestamp $
+ AstAccountFromDomain $
+ AstAccountFromUser $
+ AstAccountFullContact $
+ AstAccountHost $
+ AstAccountIgnoreSDPVersion $
+ AstAccountInsecure $
AstAccountIPAddress $
- AstAccountMailbox $
- AstAccountRealmedPassword $
+ AstAccountLanguage $
+ AstAccountLastQualifyMilliseconds $
+ AstAccountMailbox $
+ AstAccountMusicOnHold $
AstAccountNAT $
- AstAccountDeny $
- AstAccountPermit $
- AstAccountPickupGroup $
+ AstAccountName $
+ AstAccountPermit $
+ AstAccountPickupGroup $
AstAccountPort $
- AstAccountQualify $
- AstAccountRestrictCID $
- AstAccountRTPTimeout $
+ AstAccountPromiscRedir $
+ AstAccountQualify $
AstAccountRTPHoldTimeout $
- AstAccountType $
- AstAccountDisallowedCodec $
- AstAccountAllowedCodec $
- AstAccountMusicOnHold $
- AstAccountExpirationTimestamp $
- AstAccountRegistrationContext $
+ AstAccountRTPTimeout $
+ AstAccountRealmedPassword $
+ AstAccountRegistrationContext $
AstAccountRegistrationExten $
AstAccountRegistrationServer $
- AstAccountCanCallForward $
- AstAccountSecret $
- AstAccountName $
- AstAccountLastQualifyMilliseconds $
- AstAccountCallLimit
+ AstAccountRestrictCID $
+ AstAccountSecret $
+ AstAccountSetVar $
+ AstAccountSubscribeContext $
+ AstAccountTransport $
+ AstAccountType $
+ AstAccountUserAgent $
+ AstAccountVideoSupport
)
)
#
@@ -734,3 +807,29 @@ olcObjectClasses: ( AsteriskVoiceMail
)
)
#
+olcObjectClasses: ( AsteriskDialplan
+ NAME 'AsteriskDialplan'
+ DESC 'Asterisk Dialplan Information'
+ SUP top STRUCTURAL
+ MUST (
+ AstExtension
+ )
+ )
+#
+olcObjectClasses: ( AsteriskAccount
+ NAME 'AsteriskAccount'
+ DESC 'Asterisk Account Information'
+ SUP top STRUCTURAL
+ MUST (
+ AstAccountName
+ )
+ )
+#
+olcObjectClasses: ( AsteriskMailbox
+ NAME 'AsteriskMailbox'
+ DESC 'Asterisk Mailbox Information'
+ SUP top STRUCTURAL
+ MUST (
+ AstVoicemailMailbox
+ )
+ )