Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Added three new attributes and applied a patch to res_config_ldap.c

Browse Source 
attributetype ( AstAccountSubscribeContext
        NAME 'AstAccountSubscribeContext'
        DESC 'Asterisk subscribe context'
        EQUALITY caseIgnoreMatch
        SUBSTR caseIgnoreSubstringsMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)

attributetype ( AstAccountIpAddr
        NAME 'AstAccountIpAddr'
        DESC 'Asterisk aaccount IP address'
        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'
        EQUALITY caseIgnoreMatch
        SUBSTR caseIgnoreSubstringsMatch
        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)

and patch fix_empty_attributes_1.6.1.4_v2.patch 

(closes issue #13725)
Reported by: macogeek
Patches:
      fix_empty_attributes_1.6.1.4_v2.patch uploaded by xvisor (license 863)
Tested by: suretec




git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@211767 65c4cc65-6c06-0410-ace0-fbb531ad65f3
certified/1.8.6
Gavin Henry 16 years ago
parent 0ff53eddef
commit f2b9fc797d
3 changed files with 77 additions and 12 deletions
Show Stats Download Patch File Download Diff File

37
contrib/scripts/asterisk.ldap-schema
Unescape View File

@ -1,9 +1,10 @@
# #
# Copyright (c) 2007-2009 Suretec Systems Ltd. - <http://www.suretecsystems.com/> # Copyright (c) 2007-2009 Suretec Systems Ltd. - <http://www.suretecsystems.com/>
# #
# Version: 3.1.8 # Version: 3.1.9
# #
# Changes: # Changes:
# - https://issues.asterisk.org/view.php?id=13725 - 12/08/2009
# - Added AsteriskVoiceMail Object class and AstAccountCallLimit attribute - 28/05/2009 # - Added AsteriskVoiceMail Object class and AstAccountCallLimit attribute - 28/05/2009
# https://issues.asterisk.org/view.php?id=15155 # https://issues.asterisk.org/view.php?id=15155
# - Added AstAccountLastQualifyMilliseconds - 28/05/2009 # - Added AstAccountLastQualifyMilliseconds - 28/05/2009
@ -92,6 +93,9 @@ objectIdentifier AstVoicemailPager AstAttrType:55
objectIdentifier AstVoicemailOptions AstAttrType:56 objectIdentifier AstVoicemailOptions AstAttrType:56
objectIdentifier AstVoicemailTimestamp AstAttrType:57 objectIdentifier AstVoicemailTimestamp AstAttrType:57
objectIdentifier AstVoicemailContext AstAttrType:58 objectIdentifier AstVoicemailContext AstAttrType:58
objectIdentifier AstAccountSubscribeContext AstAttrType:59
objectIdentifier AstAccountIpAddr AstAttrType:60
objectIdentifier AstAccountUserAgent AstAttrType:61
############################################################################# #############################################################################
@ -547,6 +551,27 @@ attributetype ( AstVoicemailContext
SUBSTR caseIgnoreSubstringsMatch SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
attributetype ( AstAccountSubscribeContext
NAME 'AstAccountSubscribeContext'
DESC 'Asterisk subscribe context'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
attributetype ( AstAccountIpAddr
NAME 'AstAccountIpAddr'
DESC 'Asterisk aaccount IP address'
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'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
############################################################################# #############################################################################
# Object Class definitions # Object Class definitions
# #
@ -610,7 +635,10 @@ objectclass ( AsteriskIAXUser
AstAccountNoTransfer $ AstAccountNoTransfer $
AstAccountName $ AstAccountName $
AstAccountLastQualifyMilliseconds $ AstAccountLastQualifyMilliseconds $
AstAccountCallLimit AstAccountCallLimit $
AstAccountSubscribeContext $
AstAccountIpAddr $
AstAccountUserAgent
) )
) )
@ -656,7 +684,10 @@ objectclass ( AsteriskSIPUser
AstAccountSecret $ AstAccountSecret $
AstAccountName $ AstAccountName $
AstAccountLastQualifyMilliseconds $ AstAccountLastQualifyMilliseconds $
AstAccountCallLimit AstAccountCallLimit $
AstAccountSubscribeContext $
AstAccountIpAddr $
AstAccountUserAgent
) )
) )

27
contrib/scripts/asterisk.ldif
Unescape View File

@ -1,9 +1,10 @@
# #
# Copyright (c) 2007-2009 Suretec Systems Ltd. - <http://www.suretecsystems.com/> # Copyright (c) 2007-2009 Suretec Systems Ltd. - <http://www.suretecsystems.com/>
# #
# Version: 3.1.8 # Version: 3.1.9
# #
# Changes: # Changes:
# - https://issues.asterisk.org/view.php?id=13725 - 12/08/2009
# - Added AsteriskVoiceMail Object class and AstAccountCallLimit attribute - 28/05/2009 # - Added AsteriskVoiceMail Object class and AstAccountCallLimit attribute - 28/05/2009
# https://issues.asterisk.org/view.php?id=15155 # https://issues.asterisk.org/view.php?id=15155
# - Added AstAccountLastQualifyMilliseconds - 28/05/2009 # - Added AstAccountLastQualifyMilliseconds - 28/05/2009
@ -96,6 +97,9 @@ olcObjectIdentifier: AstVoicemailPager AstAttrType:55
olcObjectIdentifier: AstVoicemailOptions AstAttrType:56 olcObjectIdentifier: AstVoicemailOptions AstAttrType:56
olcObjectIdentifier: AstVoicemailTimestamp AstAttrType:57 olcObjectIdentifier: AstVoicemailTimestamp AstAttrType:57
olcObjectIdentifier: AstVoicemailContext AstAttrType:58 olcObjectIdentifier: AstVoicemailContext AstAttrType:58
olcObjectIdentifier: AstAccountSubscribeContext AstAttrType:59
olcObjectIdentifier: AstAccountIpAddr AstAttrType:60
olcObjectIdentifier: AstAccountUserAgent AstAttrType:61
# #
# #
############################################################################# #############################################################################
@ -551,6 +555,27 @@ olcAttributeTypes: ( AstVoicemailContext
SUBSTR caseIgnoreSubstringsMatch SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15) SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
# #
olcAttributeTypes: ( AstAccountSubscribeContext
NAME 'AstAccountSubscribeContext'
DESC 'Asterisk subscribe context'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
#
olcAttributeTypes: ( AstAccountIpAddr
NAME 'AstAccountIpAddr'
DESC 'Asterisk aaccount IP address'
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'
EQUALITY caseIgnoreMatch
SUBSTR caseIgnoreSubstringsMatch
SYNTAX 1.3.6.1.4.1.1466.115.121.1.15)
#
############################################################################# #############################################################################
# Object Class definitions # Object Class definitions
# #

17
res/res_config_ldap.c
Unescape View File

@ -1229,18 +1229,23 @@ static int update_ldap(const char *basedn, const char *table_name, const char *a
mods_size++; mods_size++;
ldap_mods = ast_realloc(ldap_mods, sizeof(LDAPMod *) * mods_size); ldap_mods = ast_realloc(ldap_mods, sizeof(LDAPMod *) * mods_size);
ldap_mods[mods_size - 1] = NULL; ldap_mods[mods_size - 1] = NULL;
ldap_mods[mods_size - 2] = ast_calloc(1, sizeof(LDAPMod));
ldap_mods[mods_size - 2]->mod_op = LDAP_MOD_REPLACE; ldap_mods[mods_size - 2] = ast_calloc(1, sizeof(LDAPMod));
ldap_mods[mods_size - 2]->mod_type = ast_calloc(sizeof(char), strlen(newparam) + 1); ldap_mods[mods_size - 2]->mod_type = ast_calloc(sizeof(char), strlen(newparam) + 1);
strcpy(ldap_mods[mods_size - 2]->mod_type, newparam); strcpy(ldap_mods[mods_size - 2]->mod_type, newparam);
if (strlen(newval) == 0) {
ldap_mods[mods_size - 2]->mod_op = LDAP_MOD_DELETE;
} else {
ldap_mods[mods_size - 2]->mod_op = LDAP_MOD_REPLACE;
ldap_mods[mods_size - 2]->mod_values = ast_calloc(sizeof(char *), 2); ldap_mods[mods_size - 2]->mod_values = ast_calloc(sizeof(char *), 2);
ldap_mods[mods_size - 2]->mod_values[0] = ast_calloc(sizeof(char), strlen(newval) + 1); ldap_mods[mods_size - 2]->mod_values[0] = ast_calloc(sizeof(char), strlen(newval) + 1);
strcpy(ldap_mods[mods_size - 2]->mod_values[0], newval); strcpy(ldap_mods[mods_size - 2]->mod_values[0], newval);
} }
} }
}
/* freeing ldap_mods further down */ /* freeing ldap_mods further down */
do { do {
@ -1280,9 +1285,13 @@ static int update_ldap(const char *basedn, const char *table_name, const char *a
/* Ready to update */ /* Ready to update */
if ((num_entries = ldap_count_entries(ldapConn, ldap_result_msg)) > 0) { if ((num_entries = ldap_count_entries(ldapConn, ldap_result_msg)) > 0) {
ast_debug(3, "LINE(%d) Modifying %s=%s hits: %d\n", __LINE__, attribute, lookup, num_entries); ast_debug(3, "LINE(%d) Modifying %s=%s hits: %d\n", __LINE__, attribute, lookup, num_entries);
for (i = 0; option_debug > 2 && i < mods_size - 1; i++) for (i = 0; option_debug > 2 && i < mods_size - 1; i++) {
if (ldap_mods[i]->mod_op != LDAP_MOD_DELETE) {
ast_debug(3, "LINE(%d) %s=%s \n", __LINE__, ldap_mods[i]->mod_type, ldap_mods[i]->mod_values[0]); ast_debug(3, "LINE(%d) %s=%s \n", __LINE__, ldap_mods[i]->mod_type, ldap_mods[i]->mod_values[0]);
} else {
ast_debug(3, "LINE(%d) deleting %s \n", __LINE__, ldap_mods[i]->mod_type);
}
}
ldap_entry = ldap_first_entry(ldapConn, ldap_result_msg); ldap_entry = ldap_first_entry(ldapConn, ldap_result_msg);
for (i = 0; ldap_entry; i++) { for (i = 0; ldap_entry; i++) {

Write Preview
Loading…
Cancel
Save