kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 02:37:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,883 Commits 151 Branches 1,609 Tags
b0c9f29c7273df63952c7dceab00ddea0132ad67
Commit Graph

37 Commits

Author SHA1 Message Date
Russell Bryant
d39850c2e9 Add var=value to log message on update failure, and add newline. 
... just for you, Leif.


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@292523 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2010-10-21 11:36:47 +00:00
Russell Bryant
8c9d038d26 Merged revisions 289332 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r289332 | russell | 2010-09-29 15:15:57 -0500 (Wed, 29 Sep 2010) | 4 lines
  
  Don't completely ignore md5secret from LDAP if the value does not begin with {md5}.
  
  This fixes a problem that lmadsen ran in to where md5secret was not working for him.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@289333 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2010-09-29 20:20:23 +00:00
Tilghman Lesher
76b698626c Merged revisions 279597 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.6.2

........
  r279597 | ghenry | 2010-07-26 15:25:54 -0500 (Mon, 26 Jul 2010) | 13 lines
  
  Apply all patches in:
  
  https://issues.asterisk.org/view.php?id=13573
  
  (closes issue #13573)
  Reported by: navkumar
  Patches: 
        res_config_ldap-category.diff uploaded by navkumar (license 580)
        res_config_ldap.patch uploaded by bencer (license 961)
        res_config_ldap uploaded by bencer (license 961)
  Tested by: suretec
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@279601 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2010-07-26 21:07:45 +00:00
Olle Johansson
98ad48e5d4 Minor corrections to the LDAP realtime driver 
Review: https://reviewboard.asterisk.org/r/798/

Thanks Mark for a quick review!


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@278875 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2010-07-23 13:37:17 +00:00
Tilghman Lesher
b4e18d5660 Add load priority order, such that preload becomes unnecessary in most cases 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@278132 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2010-07-20 19:35:02 +00:00
Sean Bright
37b73283ff Plug a memory leak in res_config_ldap. 
(closes issue #16257)
Reported by: nito
Patches:
      issue16257_20100111.diff uploaded by seanbright (license 71)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@240271 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2010-01-14 23:13:02 +00:00
Sean Bright
a5688e483b Fix crash in res_config_ldap. 
We need to allocate enough room for 2 pointers, not 2 characters.

(closes issue #16397)
Reported by: bklang
Patches:
      res_config_ldap.patch uploaded by applsplatz (license 949)
Tested by: applsplatz


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@239473 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2010-01-12 17:09:12 +00:00
Olle Johansson
864aa14426 Formatting, moving error messages to ERROR, removing references to unexisting debug output. No functionality changes. 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@222615 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2009-10-07 18:57:29 +00:00
Gavin Henry
f2b9fc797d Added three new attributes and applied a patch to res_config_ldap.c 
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
 2009-08-12 16:00:46 +00:00
Tilghman Lesher
642bec4d6f AST-2009-005 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@211539 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2009-08-10 19:20:57 +00:00
David Vossel
dcfe69ec64 fixes some memory leaks and redundant conditions 
(closes issue #15269)
Reported by: contactmayankjain
Patches:
      patch.txt uploaded by contactmayankjain (license 740)
      memory_leak_stuff.trunk.diff uploaded by dvossel (license 671)
Tested by: contactmayankjain, dvossel




git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@201678 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2009-06-18 16:37:42 +00:00
Kevin P. Fleming
a5c2ac4fc2 a few more namespace updates... res_ael_share still needs some work before this can be merged to other release branches 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@182848 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2009-03-18 02:39:36 +00:00
Tilghman Lesher
c8223fc957 Merge ast_str_opaque branch (discontinue usage of ast_str internals) 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@163991 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-12-13 08:36:35 +00:00
Eliel C. Sardanons
1e8e12efcf Janitor, use ARRAY_LEN() when possible. 
(closes issue #13990)
Reported by: eliel
Patches:
      array_len.diff uploaded by eliel (license 64)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@161218 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-12-05 10:31:25 +00:00
Tilghman Lesher
c1351ad237 Merge realtime_update2 branch, which adds a new realtime API call named 
'update2', which permits updates which match across multiple columns, instead
of requiring all tables to have a single unique identifier.  All of the other
API calls with the exception of 'update' already had the ability to match on
multiple fields, so it was a missing and very desireable feature that an API
call implementing an update should have this, too.

This does not change any outward performance of Asterisk, but it should make
life easier for application developers who use the RealTime framework.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@148570 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-10-14 00:08:52 +00:00
Michiel van Baak
90751b16ca Merge the cli_cleanup branch. 
This work is done by lmadsen, junky and mvanbaak
during AstriDevCon.

This is the second audit the CLI got, and
this time lmadsen made sure he had _ALL_ modules
loaded that have CLI commands in them.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@145121 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-09-28 23:32:14 +00:00
Tilghman Lesher
08af5bb312 Create a new config file status, CONFIG_STATUS_FILEINVALID for differentiating 
when a file is invalid from when a file is missing.  This is most important when
we have two configuration files.  Consider the following example:

Old system:
sip.conf     users.conf     Old result               New result
========     ==========     ==========               ==========
Missing      Missing        SIP doesn't load         SIP doesn't load
Missing      OK             SIP doesn't load         SIP doesn't load
Missing      Invalid        SIP doesn't load         SIP doesn't load
OK           Missing        SIP loads                SIP loads
OK           OK             SIP loads                SIP loads
OK           Invalid        SIP loads incompletely   SIP doesn't load
Invalid      Missing        SIP doesn't load         SIP doesn't load
Invalid      OK             SIP doesn't load         SIP doesn't load
Invalid      Invalid        SIP doesn't load         SIP doesn't load

So in the case when users.conf doesn't load because there's a typo that
disrupts the syntax, we may only partially load users, instead of failing with
an error, which may cause some calls not to get processed.  Worse yet, the old
system would do this with no indication that anything was even wrong.

(closes issue #10690)
 Reported by: dtyoo
 Patches: 
       20080716__bug10690.diff.txt uploaded by Corydon76 (license 14)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@142992 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-09-12 23:30:03 +00:00
Sean Bright
357bf3e90b All of the res/ stuff (other than res_jabber) from the RSW branch. 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137028 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-08-10 00:47:56 +00:00
Sean Bright
729df81a57 Fix some usages of snprintf, and clarify a couple variable names. 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@129864 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-07-11 00:55:06 +00:00
Tilghman Lesher
0660207614 Reduce warning to debug, otherwise we flood the log when we (legitimately) 
can't find a record.
(Closes issue #12908)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@124505 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-06-21 12:53:48 +00:00
Tilghman Lesher
5791b6680d Don't change pointers that need to be later passed back for deallocation. 
(closes issue #12572)
 Reported by: flyn
 Patches: 
       20080613__bug12572.diff.txt uploaded by Corydon76 (license 14)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@123952 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-06-19 17:22:27 +00:00
Tilghman Lesher
6006f40c14 When binding anonymously, credentials are still needed. 
(closes issue #12601)
 Reported by: suretec
 Patches: 
       res_config_ldap.c.patch uploaded by suretec (license 70)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@118302 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-05-27 13:30:10 +00:00
Joshua Colp
ac876a8e4e Make the ldap version setting work without having both version and protocol set. 
(closes issue #12613)
Reported by: suretec


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@116350 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-05-14 18:25:54 +00:00
Russell Bryant
60f877ad5f Only save a password if a username exists. 
(closes issue #12600)
Reported By: suretec
Patch by me


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@115523 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-05-07 18:33:50 +00:00
Russell Bryant
aeb41dbdf4 Use the default that the log output claims will be used for the basedn 
(closes issue #12599)
Reported by: suretec
Patches:
      12599.patch uploaded by juggie (license 24)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@115521 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-05-07 18:30:12 +00:00
Joshua Colp
6d5290a85b Only print out the error message if ldap_modify_ext_s actually returns an error, and not success. 
(closes issue #12438)
Reported by: gservat
Patches:
      res_config_ldap.c-patch-code uploaded by gservat (license 466)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114320 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-04-21 14:34:06 +00:00
Joshua Colp
116859bd19 If the parsing of the config file fails make sure we unlock ldap_lock. 
(closes issue #12477)
Reported by: IgorG


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114254 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-04-18 16:11:27 +00:00
Tilghman Lesher
7128ba0bb8 Use the correct function for free'ing objects, and maybe we won't crash. 
(closes issue #12163)
 Reported by: gservat
 Patches: 
       20080411__bug12163.diff.txt uploaded by Corydon76 (license 14)
 Tested by: gservat


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114085 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-04-11 23:12:16 +00:00
Tilghman Lesher
d304a88457 Errors are all greater than 0 
(closes issue #12422)
 Reported by: nito
 Patches: 
       res_config_ldap_result_check_patch.diff uploaded by nito (license 340)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114061 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-04-11 14:54:22 +00:00
Tilghman Lesher
58fa8e6e9e Change back to using ldap_initialize() and let the user specify a URL directly, 
instead of trying to piece it together, badly.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@109775 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-03-18 23:22:25 +00:00
Tilghman Lesher
92ecf53d44 Set protocol version, port number correctly. 
(closes issue #12211, closes issue #12209)
 Reported by: sylvain


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@109683 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-03-18 20:13:40 +00:00
Terry Wilson
b02bc230af Go through and fix a bunch of places where character strings were being interpreted as format strings. Most of these changes are solely to make compiling with -Wsecurity and -Wformat=2 happy, and were not 
actual problems, per se.  I also added format attributes to any printf wrapper functions I found that didn't have them.  -Wsecurity and -Wmissing-format-attribute added to --enable-dev-mode.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@109447 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-03-18 15:43:34 +00:00
Tilghman Lesher
d02f74ebfe An offhand comment from Russell made me realize that the configuration file 
caching would not work properly for users.conf and any other file read from
more than one place.  I needed to add the filename which requested the config
file to get it to work properly.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@107791 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-03-11 22:55:16 +00:00
Tilghman Lesher
8afeb7df4b Missing braces, fix parsing 
(closes issue #12112)
 Reported by: cyrenity
 Patches: 
       res_config_ldap.patch-03-03-2008 uploaded by cyrenity (license 416)
 Tested by: cyrenity, Corydon76


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@106346 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-03-06 05:21:39 +00:00
Jason Parker
72bc8a7c7d Fix up some doxygen issues. 
(closes issue #11996)
Patches:
      bug_11996_doxygen.diff uploaded by snuffy (license 35)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@103723 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-02-15 17:29:08 +00:00
Tilghman Lesher
b0426aad08 Coding guidelines cleanup 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@99758 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-01-23 03:57:31 +00:00
Tilghman Lesher
cfa0ec1f97 Add res_config_ldap for realtime LDAP engine. 
(closes issue #5768)
 Reported by: mguesdon
 Patches: 
       res_config_ldap-v0.7.tar.gz uploaded by mguesdon (license 121)
       res_ldap.conf.sample uploaded by suretec (license 70)
       asterisk-v3.1.4.ldif uploaded by suretec (license 70)
       asterisk-v3.1.4.schema uploaded by suretec (license 70)
 Tested by: oej, mguesdon, suretec, cthorner


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@99696 65c4cc65-6c06-0410-ace0-fbb531ad65f3
 2008-01-22 22:33:20 +00:00