Merged revisions 229050 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r229050 | ghenry | 2009-11-10 11:16:10 +0000 (Tue, 10 Nov 2009) | 20 lines
  
  Schema file additions
  
  * Added AsteriskDialplan, AsteriskAccount and AsteriskMailbox  objectClasses
    to allow standalone dialplan, account and mailbox entries (STRUCTURAL)
  * Added new Fields:
  - AstAccountLanguage, AstAccountTransport, AstAccountPromiscRedir,
  - AstAccountAccountCode, AstAccountSetVar, AstAccountAllowOverlap,
  - AstAccountVideoSupport, AstAccountIgnoreSDPVersion
  * Removed redundant IPaddr (there's already IPAddress)
  - Gives more configuration Flags for SIP-Users available (tested)
  - Allows to create Asterisk Attributes in defined Asterisk ObjectClasses
    without extensibleObject (which really should be the last resort); gives
    also additional possibilities for LDAP-filter 
  
  (closes issue #15874)
  Reported by: Medozas
  Patches:
        asterisk.ldap-schema.patch uploaded by Medozas (license 41)
  Tested by: Medozas, suretec
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@229057 65c4cc65-6c06-0410-ace0-fbb531ad65f3

contrib/scripts/asterisk.ldap-schema

@@ -1,9 +1,17 @@
 #
 # Copyright (c) 2007-2009 Suretec Systems Ltd. - <http://www.suretecsystems.com/>
 #
-# Version: 3.2.0
+# Version: 3.2.2
 #
 # Changes:
+
+# - Added AsteriskDialplan, AsteriskAccount and AsteriskMailbox objectClasses
+#   to allow standalone dialplan, account and mailbox entries (STRUCTURAL)
+# - Added new Fields
+#   * AstAccountLanguage, AstAccountTransport, AstAccountPromiscRedir, 
+#   * AstAccountAccountCode, AstAccountSetVar, AstAccountAllowOverlap,
+#   * AstAccountVideoSupport, AstAccountIgnoreSDPVersion    
+#   Removed redundant IPaddr (there's already IPAddress)
 # - 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
@@ -14,6 +22,7 @@
 # - Fixed wrong DESC - 07/05/2008
 #
 # Author: Gavin Henry - <ghenry@suretecsystems.com>
+#         Michael Kromer - <medozas@medozas.de>
 #
 # Asterisk LDAP Schema
 #
@@ -32,7 +41,6 @@ objectIdentifier AsteriskLDAP AsteriskRoot:5
 #############################################################################
 objectIdentifier AstAttrType AsteriskLDAP:4
 
-
 #############################################################################
 # Attribute OIDs e.g.: objectIdentifier AstContext AstAttrType:1
 #############################################################################
@@ -95,8 +103,15 @@ objectIdentifier AstVoicemailOptions AstAttrType:56
 objectIdentifier AstVoicemailTimestamp AstAttrType:57
 objectIdentifier AstVoicemailContext AstAttrType:58
 objectIdentifier AstAccountSubscribeContext AstAttrType:59
-objectIdentifier AstAccountIpAddr AstAttrType:60
 objectIdentifier AstAccountUserAgent AstAttrType:61
+objectIdentifier AstAccountLanguage AstAttrType:62
+objectIdentifier AstAccountTransport AstAttrType:63
+objectIdentifier AstAccountPromiscRedir AstAttrType:64
+objectIdentifier AstAccountAccountCode AstAttrType:65
+objectIdentifier AstAccountSetVar AstAttrType:66
+objectIdentifier AstAccountAllowOverlap AstAttrType:67
+objectIdentifier AstAccountVideoSupport AstAttrType:68
+objectIdentifier AstAccountIgnoreSDPVersion AstAttrType:69
 
 
 #############################################################################
@@ -108,6 +123,9 @@ objectIdentifier AsteriskIAXUser AstObjectClass:2
 objectIdentifier AsteriskSIPUser AstObjectClass:3
 objectIdentifier AsteriskConfig AstObjectClass:4
 objectIdentifier AsteriskVoiceMail AstObjectClass:5
+objectIdentifier AsteriskDialplan AstObjectClass:6
+objectIdentifier AsteriskAccount AstObjectClass:7
+objectIdentifier AsteriskMailbox AstObjectClass:8
 
 
 #############################################################################
@@ -559,16 +577,65 @@ attributetype ( AstAccountSubscribeContext
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
 
-attributetype ( AstAccountIpAddr
-        NAME 'AstAccountIpAddr'
-        DESC 'Asterisk aaccount IP address'
+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)
 
-attributetype ( AstAccountUserAgent
-        NAME 'AstAccountUserAgent'
-        DESC 'Asterisk account user context'
+attributetype ( AstAccountLanguage
+        NAME 'AstAccountLanguage'
+        DESC 'Asterisk account user language'
+        EQUALITY caseIgnoreMatch
+        SUBSTR caseIgnoreSubstringsMatch
+        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
+
+attributetype ( AstAccountTransport
+        NAME 'AstAccountTransport'
+        DESC 'Asterisk account transport type'
+        EQUALITY caseIgnoreMatch
+        SUBSTR caseIgnoreSubstringsMatch
+        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
+
+attributetype ( AstAccountPromiscRedir
+        NAME 'AstAccountPromiscRedir'
+        DESC 'Asterisk account promiscous redirects'
+        EQUALITY caseIgnoreMatch
+        SUBSTR caseIgnoreSubstringsMatch
+        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
+
+attributetype ( AstAccountAccountCode
+        NAME 'AstAccountAccountCode'
+        DESC 'Asterisk account billing code'
+        EQUALITY caseIgnoreMatch
+        SUBSTR caseIgnoreSubstringsMatch
+        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
+
+attributetype ( AstAccountSetVar
+        NAME 'AstAccountSetVar'
+        DESC 'Asterisk account setvar'
+        EQUALITY caseIgnoreMatch
+        SUBSTR caseIgnoreSubstringsMatch
+        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
+
+attributetype ( 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)
+
+attributetype ( AstAccountVideoSupport
+        NAME 'AstAccountVideoSupport'
+        DESC 'Asterisk account video support'
+        EQUALITY caseIgnoreMatch
+        SUBSTR caseIgnoreSubstringsMatch
+        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
+
+attributetype ( 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)
@@ -628,6 +695,7 @@ objectclass ( AsteriskIAXUser
         AstAccountPort $ 
         AstAccountQualify $ 
         AstAccountType $
+        AstAccountLanguage $
         AstAccountDisallowedCodec $ 
         AstAccountExpirationTimestamp $ 
         AstAccountRegistrationContext $
@@ -636,9 +704,9 @@ objectclass ( AsteriskIAXUser
         AstAccountName $
         AstAccountLastQualifyMilliseconds $
         AstAccountCallLimit $
-		AstAccountSubscribeContext $
-		AstAccountIpAddr $
-		AstAccountUserAgent		
+        AstAccountSubscribeContext $
+        AstAccountIPAddress $
+        AstAccountUserAgent		
     )
     )
        
@@ -648,46 +716,53 @@ objectclass ( AsteriskSIPUser
     SUP AsteriskExtension AUXILIARY
     MUST cn
     MAY (
+        AstAccountAccountCode $
+        AstAccountAllowOverlap $
+        AstAccountAllowedCodec $ 
         AstAccountAMAFlags $ 
         AstAccountCallGroup $ 
+        AstAccountCallLimit $
         AstAccountCallerID $ 
+        AstAccountCanCallForward $ 
         AstAccountCanReinvite $
         AstAccountContext $
-        AstAccountDefaultUser $
         AstAccountDTMFMode $ 
-        AstAccountFromUser $ 
+        AstAccountDefaultUser $
+        AstAccountDeny $ 
+        AstAccountDisallowedCodec $ 
+        AstAccountExpirationTimestamp $ 
         AstAccountFromDomain $     
+        AstAccountFromUser $ 
         AstAccountFullContact $ 
         AstAccountHost $ 
+        AstAccountIgnoreSDPVersion $  
         AstAccountInsecure $  
         AstAccountIPAddress $
+        AstAccountLanguage $
+        AstAccountLastQualifyMilliseconds $
         AstAccountMailbox $    
-        AstAccountRealmedPassword $ 
+        AstAccountMusicOnHold $
         AstAccountNAT $
-        AstAccountDeny $ 
+        AstAccountName $
         AstAccountPermit $ 
         AstAccountPickupGroup $ 
         AstAccountPort $
+        AstAccountPromiscRedir $
         AstAccountQualify $ 
-        AstAccountRestrictCID $ 
-        AstAccountRTPTimeout $ 
         AstAccountRTPHoldTimeout $
-        AstAccountType $ 
-        AstAccountDisallowedCodec $ 
-        AstAccountAllowedCodec $ 
-        AstAccountMusicOnHold $
-        AstAccountExpirationTimestamp $ 
+        AstAccountRTPTimeout $ 
+        AstAccountRealmedPassword $ 
         AstAccountRegistrationContext $ 
         AstAccountRegistrationExten $
         AstAccountRegistrationServer $
-        AstAccountCanCallForward $ 
+        AstAccountRestrictCID $ 
         AstAccountSecret $ 
-        AstAccountName $
-        AstAccountLastQualifyMilliseconds $
-        AstAccountCallLimit $
-		AstAccountSubscribeContext $
-		AstAccountIpAddr $
-		AstAccountUserAgent	
+        AstAccountSetVar $
+        AstAccountSubscribeContext $
+        AstAccountTransport $
+        AstAccountType $ 
+        AstAccountUserAgent $	
+        AstAccountVideoSupport
     )
     )
 
@@ -735,3 +810,24 @@ objectclass ( AsteriskVoiceMail
     AstVoicemailContext
     )
     )
+
+objectClass (
+	AsteriskDialplan
+	NAME 'AsteriskDialplan'
+	DESC 'Asterisk Dialplan Information'
+	SUP top STRUCTURAL
+	MUST ( AstExtension ) )
+
+objectClass (
+	AsteriskAccount
+	NAME 'AsteriskAccount'
+	DESC 'Asterisk Account Information'
+	SUP top STRUCTURAL
+	MUST ( AstAccountName ) )
+
+objectClass (
+	AsteriskMailbox
+	NAME 'AsteriskMailbox'
+	DESC 'Asterisk Mailbox Information'
+	SUP top STRUCTURAL
+	MUST ( AstVoicemailMailbox ) )