diff options
| -rw-r--r-- | configs/res_ldap.conf.sample | 2 | ||||
| -rw-r--r-- | contrib/scripts/asterisk.ldap-schema | 21 | ||||
| -rw-r--r-- | contrib/scripts/asterisk.ldif | 42 | ||||
| -rw-r--r-- | doc/ldap.txt | 4 |
4 files changed, 58 insertions, 11 deletions
diff --git a/configs/res_ldap.conf.sample b/configs/res_ldap.conf.sample index 98343c9b3..0a442298d 100644 --- a/configs/res_ldap.conf.sample +++ b/configs/res_ldap.conf.sample @@ -91,6 +91,7 @@ CanCallForward = AstAccountCanCallForward ipaddr = AstAccountIPAddress defaultuser = AstAccountDefaultUser regserver = AstAccountRegistrationServer +lastms = AstAccountLastQualifyMilliseconds additionalFilter=(objectClass=AsteriskSIPUser) ; @@ -116,6 +117,7 @@ regseconds = AstAccountExpirationTimestamp regcontext = AstAccountRegistrationContext regexten = AstAccountRegistrationExten notransfer = AstAccountNoTransfer +lastms = AstAccountLastQualifyMilliseconds additionalFilter=(objectClass=AstAccountIAX) ; diff --git a/contrib/scripts/asterisk.ldap-schema b/contrib/scripts/asterisk.ldap-schema index 667966a04..7188e4a2f 100644 --- a/contrib/scripts/asterisk.ldap-schema +++ b/contrib/scripts/asterisk.ldap-schema @@ -1,9 +1,11 @@ # -# Copyright (c) 2007-2008 Suretec Systems Ltd. - <http://www.suretecsystems.com/> +# Copyright (c) 2007-2009 Suretec Systems Ltd. - <http://www.suretecsystems.com/> # -# Version: 3.1.6 +# Version: 3.1.7 # # Changes: +# - Added AstAccountLastQualifyMilliseconds - 28/05/2009 +# https://issues.asterisk.org/view.php?id=15156 # - http://bugs.digium.com/view.php?id=12860 - 04/07/2008 # - Fixed wrong DESC - 07/05/2008 # @@ -78,7 +80,7 @@ objectIdentifier AstConfigCommented AstAttrType:45 objectIdentifier AstAccountIPAddress AstAttrType:46 objectIdentifier AstAccountDefaultUser AstAttrType:47 objectIdentifier AstAccountRegistrationServer AstAttrType:48 - +objectIdentifier AstAccountLastQualifyMilliseconds AstAttrType:49 ############################################################################# # Object Class OIDs @@ -462,6 +464,13 @@ attributetype ( AstAccountRegistrationServer SUBSTR caseIgnoreSubstringsMatch 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) + ############################################################################# # Object Class definitions # @@ -522,7 +531,8 @@ objectclass ( AsteriskIAXUser AstAccountRegistrationContext$ AstAccountRegistrationExten $ AstAccountNoTransfer $ - AstAccountName + AstAccountName $ + AstAccountLastQualifyMilliseconds ) ) @@ -566,7 +576,8 @@ objectclass ( AsteriskSIPUser AstAccountRegistrationServer $ AstAccountCanCallForward $ AstAccountSecret $ - AstAccountName + AstAccountName $ + AstAccountLastQualifyMilliseconds ) ) diff --git a/contrib/scripts/asterisk.ldif b/contrib/scripts/asterisk.ldif index c91308e9c..ee6965a6c 100644 --- a/contrib/scripts/asterisk.ldif +++ b/contrib/scripts/asterisk.ldif @@ -1,9 +1,12 @@ # -# Copyright (c) 2007-2008 Suretec Systems Ltd. - <http://www.suretecsystems.com/> +# Copyright (c) 2007-2009 Suretec Systems Ltd. - <http://www.suretecsystems.com/> # -# Version: 3.1.6 +# Version: 3.1.7 # # Changes: +# - 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 # @@ -82,6 +85,7 @@ olcObjectIdentifier: AstConfigCommented AstAttrType:45 olcObjectIdentifier: AstAccountIPAddress AstAttrType:46 olcObjectIdentifier: AstAccountDefaultUser AstAttrType:47 olcObjectIdentifier: AstAccountRegistrationServer AstAttrType:48 +olcObjectIdentifier: AstAccountLastQualifyMilliseconds AstAttrType:49 # # ############################################################################# @@ -445,6 +449,34 @@ olcAttributeTypes: ( AstConfigCommented SUBSTR caseIgnoreSubstringsMatch 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) +# +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) +# +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) +# +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) +# ############################################################################# # Object Class definitions # @@ -505,7 +537,8 @@ olcObjectClasses: ( AsteriskIAXUser AstAccountRegistrationContext$ AstAccountRegistrationExten $ AstAccountNoTransfer $ - AstAccountName + AstAccountName $ + AstAccountLastQualifyMilliseconds ) ) # @@ -549,7 +582,8 @@ olcObjectClasses: ( AsteriskSIPUser AstAccountRegistrationServer $ AstAccountCanCallForward $ AstAccountSecret $ - AstAccountName + AstAccountName $ + AstAccountLastQualifyMilliseconds ) ) # diff --git a/doc/ldap.txt b/doc/ldap.txt index c4d658d66..5cc2246ed 100644 --- a/doc/ldap.txt +++ b/doc/ldap.txt @@ -1,13 +1,13 @@ Asterisk Realtime LDAP Driver --------------------------- -With this driver Asterisk can retrieve information from a LDAP drectory, including +With this driver Asterisk can retrieve information from an LDAP drectory, including sip/iax users, extensions and configuration. See configs/res_ldap.conf.sample for a configuration file sample -Here is a LDAP dif sample: +Here is a LDAP diff sample: # Base SIP Phones Entry dn: uid=phone-base,dc=myDomain,dc=myDomainExt |