diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-05 15:19:08 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-05 15:19:08 +0000 |
commit | cb01ff52b8b22fca7f86891c079ef99dd8b38716 (patch) | |
tree | c4d0129119c710a74f2ffee88a738086e059ffc6 /contrib/scripts | |
parent | af8be9ea30ab3debd8684850a794fbee66901784 (diff) |
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)
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@128161 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'contrib/scripts')
-rw-r--r-- | contrib/scripts/asterisk.ldap-schema | 30 | ||||
-rw-r--r-- | contrib/scripts/asterisk.ldif | 6 |
2 files changed, 35 insertions, 1 deletions
diff --git a/contrib/scripts/asterisk.ldap-schema b/contrib/scripts/asterisk.ldap-schema index 596f3c66f..667966a04 100644 --- a/contrib/scripts/asterisk.ldap-schema +++ b/contrib/scripts/asterisk.ldap-schema @@ -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@suretecsystems.com> @@ -74,6 +75,9 @@ objectIdentifier AstConfigCategoryMetric AstAttrType:42 objectIdentifier AstConfigVariableName AstAttrType:43 objectIdentifier AstConfigVariableValue AstAttrType:44 objectIdentifier AstConfigCommented AstAttrType:45 +objectIdentifier AstAccountIPAddress AstAttrType:46 +objectIdentifier AstAccountDefaultUser AstAttrType:47 +objectIdentifier AstAccountRegistrationServer AstAttrType:48 ############################################################################# @@ -437,6 +441,27 @@ attributetype ( AstConfigCommented 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) + ############################################################################# # Object Class definitions # @@ -512,12 +537,14 @@ objectclass ( AsteriskSIPUser AstAccountCallerID $ AstAccountCanReinvite $ AstAccountContext $ + AstAccountDefaultUser $ AstAccountDTMFMode $ AstAccountFromUser $ AstAccountFromDomain $ AstAccountFullContact $ AstAccountHost $ AstAccountInsecure $ + AstAccountIPAddress $ AstAccountMailbox $ AstAccountRealmedPassword $ AstAccountNAT $ @@ -536,6 +563,7 @@ objectclass ( AsteriskSIPUser AstAccountExpirationTimestamp $ AstAccountRegistrationContext $ AstAccountRegistrationExten $ + AstAccountRegistrationServer $ AstAccountCanCallForward $ AstAccountSecret $ AstAccountName diff --git a/contrib/scripts/asterisk.ldif b/contrib/scripts/asterisk.ldif index f65ec0219..85174b8b6 100644 --- a/contrib/scripts/asterisk.ldif +++ b/contrib/scripts/asterisk.ldif @@ -78,6 +78,9 @@ olcObjectIdentifier: AstConfigCategoryMetric AstAttrType:42 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 @@ olcObjectClasses: ( AsteriskSIPUser AstAccountCallerID $ AstAccountCanReinvite $ AstAccountContext $ + AstAccountDefaultUser $ AstAccountDTMFMode $ AstAccountFromUser $ AstAccountFromDomain $ AstAccountFullContact $ AstAccountHost $ AstAccountInsecure $ + AstAccountIPAddress $ AstAccountMailbox $ AstAccountRealmedPassword $ AstAccountNAT $ @@ -540,6 +545,7 @@ olcObjectClasses: ( AsteriskSIPUser AstAccountExpirationTimestamp $ AstAccountRegistrationContext $ AstAccountRegistrationExten $ + AstAccountRegistrationServer $ AstAccountCanCallForward $ AstAccountSecret $ AstAccountName |