[svn-commits] tilghman: branch 1.6.0 r128161 - in /branches/1.6.0: ./ contrib/scripts/

[SVN commits to the Digium repositories]

Author: tilghman
Date: Sat Jul  5 10:19:08 2008
New Revision: 128161

URL: http://svn.digium.com/view/asterisk?view=rev&rev=128161
Log:
Merged revisions 128160 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r128160 | tilghman | 2008-07-05 10:17:51 -0500 (Sat, 05 Jul 2008) | 7 lines

LDAP schema updates
(closes issue #12860)
 Reported by: flyn
 Patches: 
       asterisk.ldif uploaded by suretec (license 70)
       asterisk.schema uploaded by suretec (license 70)

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/contrib/scripts/asterisk.ldap-schema
    branches/1.6.0/contrib/scripts/asterisk.ldif

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/contrib/scripts/asterisk.ldap-schema
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/contrib/scripts/asterisk.ldap-schema?view=diff&rev=128161&r1=128160&r2=128161
==============================================================================
--- branches/1.6.0/contrib/scripts/asterisk.ldap-schema (original)
+++ branches/1.6.0/contrib/scripts/asterisk.ldap-schema Sat Jul  5 10:19:08 2008
@@ -1,9 +1,10 @@
 #
 # Copyright (c) 2007-2008 Suretec Systems Ltd. - <http://www.suretecsystems.com/>
 #
-# Version: 3.1.5
+# Version: 3.1.6
 #
 # Changes:
+# - http://bugs.digium.com/view.php?id=12860 - 04/07/2008
 # - Fixed wrong DESC - 07/05/2008
 #
 # Author: Gavin Henry - <ghenry at suretecsystems.com>
@@ -74,6 +75,9 @@
 objectIdentifier AstConfigVariableName AstAttrType:43
 objectIdentifier AstConfigVariableValue AstAttrType:44
 objectIdentifier AstConfigCommented AstAttrType:45
+objectIdentifier AstAccountIPAddress AstAttrType:46
+objectIdentifier AstAccountDefaultUser AstAttrType:47
+objectIdentifier AstAccountRegistrationServer AstAttrType:48
 
 
 #############################################################################
@@ -433,6 +437,27 @@
 attributetype ( AstConfigCommented
         NAME 'AstConfigCommented'
         DESC 'Asterisk LDAP Configuration Commented'
+        EQUALITY caseIgnoreMatch
+        SUBSTR caseIgnoreSubstringsMatch
+        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
+
+attributetype ( AstAccountIPAddress
+        NAME 'AstAccountIPAddress'
+        DESC 'Asterisk Account IP Address' 
+        EQUALITY caseIgnoreMatch
+        SUBSTR caseIgnoreSubstringsMatch
+        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
+          
+attributetype ( AstAccountDefaultUser
+        NAME 'AstAccountDefaultUser'
+        DESC 'Asterisk Account Default User'
+        EQUALITY caseIgnoreMatch
+        SUBSTR caseIgnoreSubstringsMatch
+        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
+
+attributetype ( AstAccountRegistrationServer
+        NAME 'AstAccountRegistrationServer'
+        DESC 'Asterisk Account Registration Server' 
         EQUALITY caseIgnoreMatch
         SUBSTR caseIgnoreSubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
@@ -512,12 +537,14 @@
         AstAccountCallerID $ 
         AstAccountCanReinvite $
         AstAccountContext $
+        AstAccountDefaultUser $
         AstAccountDTMFMode $ 
         AstAccountFromUser $ 
         AstAccountFromDomain $     
         AstAccountFullContact $ 
         AstAccountHost $ 
         AstAccountInsecure $  
+        AstAccountIPAddress $
         AstAccountMailbox $    
         AstAccountRealmedPassword $ 
         AstAccountNAT $
@@ -536,6 +563,7 @@
         AstAccountExpirationTimestamp $ 
         AstAccountRegistrationContext $ 
         AstAccountRegistrationExten $
+        AstAccountRegistrationServer $
         AstAccountCanCallForward $ 
         AstAccountSecret $ 
         AstAccountName 

Modified: branches/1.6.0/contrib/scripts/asterisk.ldif
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/contrib/scripts/asterisk.ldif?view=diff&rev=128161&r1=128160&r2=128161
==============================================================================
--- branches/1.6.0/contrib/scripts/asterisk.ldif (original)
+++ branches/1.6.0/contrib/scripts/asterisk.ldif Sat Jul  5 10:19:08 2008
@@ -78,6 +78,9 @@
 olcObjectIdentifier: AstConfigVariableName AstAttrType:43
 olcObjectIdentifier: AstConfigVariableValue AstAttrType:44
 olcObjectIdentifier: AstConfigCommented AstAttrType:45
+olcObjectIdentifier: AstAccountIPAddress AstAttrType:46
+olcObjectIdentifier: AstAccountDefaultUser AstAttrType:47
+olcObjectIdentifier: AstAccountRegistrationServer AstAttrType:48
 #
 #
 #############################################################################
@@ -516,12 +519,14 @@
         AstAccountCallerID $ 
         AstAccountCanReinvite $
         AstAccountContext $
+        AstAccountDefaultUser $
         AstAccountDTMFMode $ 
         AstAccountFromUser $ 
         AstAccountFromDomain $     
         AstAccountFullContact $ 
         AstAccountHost $ 
         AstAccountInsecure $  
+        AstAccountIPAddress $
         AstAccountMailbox $    
         AstAccountRealmedPassword $ 
         AstAccountNAT $
@@ -540,6 +545,7 @@
         AstAccountExpirationTimestamp $ 
         AstAccountRegistrationContext $ 
         AstAccountRegistrationExten $
+        AstAccountRegistrationServer $
         AstAccountCanCallForward $ 
         AstAccountSecret $ 
         AstAccountName