Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-30 16:36:29 +01:00
Code Releases Activity
3,196 Commits 7 Branches 109 Tags 66 MiB
6cc950d76f
Commit Graph

60 Commits

Author SHA1 Message Date
Christophe Romain
4a2005f7cc update copyright up to 2011 2011-02-14 13:47:22 +01:00
Badlop
2aa56cd86e Use pg2 from R14B in systems with older versions (EJAB-1349) 
pg2_backport.erl is a copy of pg2.erl from Erlang/OTP R14B.
That module is used in ejabberd installations where an OTP
previous to R14 is installed.
 2010-11-22 16:02:36 +01:00
Evgeniy Khramtsov
0ccbd7e3f2 Do not print full error message when LDAP timeout occurs (EJAB-1324) 2010-11-17 17:15:28 +09:00
Badlop
cb953f949f Fix problems reported by Dialyzer 2010-09-15 20:04:35 +02:00
Evgeniy Khramtsov
445691bab1 fixes ampersand escaping (EJAB-1258) 2010-08-19 20:37:28 +10:00
Badlop
72b9d8b250 Remove unused and useless SVN keywords 2010-08-02 16:03:05 +02:00
Badlop
2afce7822f Use a standard method to get a random seed (EJAB-1229) 2010-05-10 15:39:20 +02:00
Evgeniy Khramtsov
3f6579ffbc new option ldap_tls_verify is added (EJAB-1229) 2010-05-10 19:57:40 +10:00
Evgeniy Khramtsov
e117ce1b7b allow inband password change (EJAB-199) 2010-04-19 21:05:19 +10:00
Evgeniy Khramtsov
5bb22101e2 LDAP extensible match support (EJAB-722) 2010-04-19 14:14:26 +10:00
Evgeniy Khramtsov
9d2fd3e52c now using "%u" pattern as default for ldap_uids (EJAB-1203) 2010-03-08 14:08:22 +09:00
Badlop
1bcd481fdc Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159) 
SVN Revision: 2892
 2010-01-12 16:15:16 +00:00
Badlop
a89b400c04 Add +export_all to EFLAGS if: make debug=true (thanks to Marcin Owsiany)(EJAB-1134) 
SVN Revision: 2843
 2009-12-29 19:15:59 +00:00
Badlop
98f79f0c47 Add devdoc support to Makefiles 
SVN Revision: 2704
 2009-10-23 15:14:08 +00:00
Badlop
29b2da42f5 Replace calls from 'regexp' to the OTP R12 new module 're' (EJAB-921) 
SVN Revision: 2582
 2009-09-02 14:26:01 +00:00
Badlop
b4a1b4c8fb Replace TYPE/1 with is_TYPE/1 (EJAB-922) 
SVN Revision: 2160
 2009-06-15 17:27:06 +00:00
Badlop
18ae44f930 Support LDAPS with TLS (EJAB-109)(thanks to Thomas Baden, Andy Harb, Sergei Golovan, Anton Podavalov) 
SVN Revision: 2099
 2009-05-25 17:16:54 +00:00
Badlop
0a9581a375 LDAP bind attempts: log warnings and increase timeout after reject. 
Merged from trunk SVN r2086:
Log warnings on unsuccessful LDAP bind attempts.
Increase timeout before the next LDAP bind attempt up to
five seconds if the last bind attempt was rejected by the
LDAP server ("soft" error) (thanks to Konstantin Khomoutov)

SVN Revision: 2087
 2009-05-18 11:41:53 +00:00
Badlop
1d3947c0da Replace TYPE/1 with is_TYPE/1 (EJAB-922) 
SVN Revision: 2057
 2009-05-06 16:54:43 +00:00
Badlop
cf4b7b36ee Merge 1856 from trunk. 
* src/eldap/eldap.erl: moves waiting for response queries to
pending queue on an LDAP connection failure (thanks to Evgeniy
Khramtsov)

SVN Revision: 1974
 2009-03-06 11:50:23 +00:00
Badlop
d23ebd354b Merge 1855 from trunk. 
* src/eldap/eldap.erl: implemented queue for pending
queries (thanks to Evgeniy Khramtsov)

SVN Revision: 1973
 2009-03-06 11:42:56 +00:00
Badlop
66c60c4e6d Merge 1851 from trunk. 
* src/eldap/eldap.erl: Close a connection on tcp_error (thanks to
Evgeniy Khramtsov)

SVN Revision: 1972
 2009-03-06 11:39:12 +00:00
Jean-Sébastien Pédron
ff500d8297 Merge from trunk (r1787 to r1804). 
Included are fixes to src/mod_configure.erl and src/mod_caps.erl.

Note: this merge doesn't include the following revisions because it was
made by previous commits:
r1766, r1768, r1781, r1783, r1794, r1797, r1799, r1802.

Warning: Ejabberd may be broken until the merge is completly finished.

PR:		EJABP-1

SVN Revision: 1829
 2009-01-19 14:47:33 +00:00
Jean-Sébastien Pédron
f83fc51960 Replace stringprep by exmpp_stringprep. 
PR:		EJABP-1

SVN Revision: 1726
 2008-12-10 14:44:08 +00:00
Jean-Sébastien Pédron
9e96043255 Merge from trunk (r1649 to r1692). 
PR:		EJABP-1

SVN Revision: 1695
 2008-12-01 15:53:30 +00:00
Jean-Sébastien Pédron
67a87af459 Merge from trunk (r1563 to r1613). 
PR:		EJABP-1

SVN Revision: 1614
 2008-10-08 12:02:30 +00:00
Jean-Sébastien Pédron
4eaa8e19c9 Merge from trunk (r1457 to r1563). 
SVN Revision: 1564
 2008-09-16 14:39:57 +00:00
Jean-Sébastien Pédron
07b1210b50 Merge revisions from 1444 to revision 1457 from trunk. 
SVN Revision: 1458
 2008-07-17 15:33:50 +00:00
Jean-Sébastien Pédron
574dbbfd08 Merge revisions from 1434 to revision 1444 from trunk. 
SVN Revision: 1445
 2008-07-15 08:45:05 +00:00
Badlop
ab1610021d * src/Makefile.in: Support for parallel compilation with 'make -j' 
in multi core CPUs: fix compilation dependencies; compile
behaviors before other source code. (thanks to Jonathan Schleifer)
* src/mod_pubsub/Makefile.in: Likewise
* src/eldap/Makefile.in: Likewise

SVN Revision: 1258
 2008-03-26 09:27:46 +00:00
Mickaël Rémond
f7a9e5bac0 * src/eldap/Makefile.in: Generate ELDAPv3.beam during first Makefile pass (EJAB-583). 
SVN Revision: 1249
 2008-03-22 16:42:28 +00:00
Mickaël Rémond
4cef493b91 * src/eldap.erl: Improved logging. We now use ejabberd logging framework (EJAB-582). 
* src/eldap.erl: Faster LDAP reconnection (Thanks to Christophe Romain) (EJAB-581)

SVN Revision: 1236
 2008-03-20 16:28:36 +00:00
Christophe Romain
53e804575f add missing ~p to error message 
SVN Revision: 1221
 2008-03-07 14:56:37 +00:00
Mickaël Rémond
0f4ee703c6 * src/eldap/eldap_pool.erl: Improved logging 
SVN Revision: 1220
 2008-03-07 14:49:06 +00:00
Badlop
2d2fcc8210 * doc/guide.tex: Updated copyright dates to 2008 
* src/*: Likewise

SVN Revision: 1153
 2008-01-15 17:02:57 +00:00
Mickaël Rémond
22f928122f * Applied copyright patch 3. 
SVN Revision: 1113
 2007-12-24 13:57:53 +00:00
Badlop
80b7abd8c8 * src/ejabberd_zlib/Makefile.win32: Compile 
all erl files found in the directory, so it isn't needed to provide
an explicit list of target files
* src/eldap/Makefile.win32: Likewise
* src/mod_irc/Makefile.win32: Likewise
* src/mod_muc/Makefile.win32: Likewise
* src/mod_proxy65/Makefile.win32: Likewise
* src/mod_pubsub/Makefile.win32: Likewise
* src/odbc/Makefile.win32: Likewise
* src/stringprep/Makefile.win32: Likewise
* src/tls/Makefile.win32: Likewise
* src/web/Makefile.win32: Likewise

SVN Revision: 1076
 2007-12-17 22:23:56 +00:00
Badlop
60f8b0772e * src/ejabberd_zlib/Makefile.in: Compile all erl files found in 
the directory, so it isn't needed to provide an explicit list of
target files
* src/eldap/Makefile.in: Likewise
* src/mod_irc/Makefile.in: Likewise
* src/mod_muc/Makefile.in: Likewise
* src/mod_proxy65/Makefile.in: Likewise
* src/mod_pubsub/Makefile.in: Likewise
* src/odbc/Makefile.in: Likewise
* src/pam/Makefile.in: Likewise
* src/stringprep/Makefile.in: Likewise
* src/tls/Makefile.in: Likewise
* src/web/Makefile.in: Likewise

SVN Revision: 1075
 2007-12-17 18:59:51 +00:00
Badlop
2b91ebcc85 * src/mod_irc/iconv.erl: Changed order of handle_info 
clause (EJAB-290)
* src/stringprep/stringprep.erl: Likesise

* src/eldap/eldap.erl: Removed handle_sync_event clause because it
is never called (EJAB-290)

SVN Revision: 1072
 2007-12-15 13:01:32 +00:00
Badlop
dd706eea94 * src/eldap/eldap.erl: Fix compilation warnings: Part 4 (EJAB-290) 
* src/web/ejabberd_web_admin.erl: Likewise

SVN Revision: 1048
 2007-12-07 01:40:24 +00:00
Badlop
d625fc80fc * src/acl.erl and other 64 files: Remove Erlang module attribute 
'vsn' because it doesn't provide any worth feature, and it
difficults hot code update (EJAB-440)

SVN Revision: 1044
 2007-12-06 22:12:27 +00:00
Badlop
44d65ff303 * src/configure.ac: Don't hardcode gcc and options (EJAB-436) 
* src/Makefile.in: 
* src/ejabberd_zlib/Makefile.in: 
* src/eldap/Makefile.in: 
* src/mod_irc/Makefile.in: 
* src/mod_muc/Makefile.in: 
* src/mod_proxy65/Makefile.in: 
* src/mod_pubsub/Makefile.in: 
* src/odbc/Makefile.in: 
* src/pam/Makefile.in: 
* src/stringprep/Makefile.in: 
* src/tls/Makefile.in: 
* src/web/Makefile.in:

SVN Revision: 1000
 2007-11-29 16:59:35 +00:00
Mickaël Rémond
2100ea63ca * Making sure SVN properties are correctly set. 
SVN Revision: 970
 2007-11-15 10:33:18 +00:00
Mickaël Rémond
c228e7aeb3 * src/Makefile.in: Added Dialyzer target (EJAB-189 - Thanks to Geoff Cant) 
* src/Makefile.in: Build XmppAddr.beam in a single pass
* src/mod_muc/Makefile.in: +debug_info directive support
* src/stringprep/Makefile.in: Likewise
* src/mod_irc/Makefile.in: Likewise
* src/web/Makefile.in: Likewise
* src/eldap/Makefile.in: Likewise
* src/mod_pubsub/Makefile.in: Likewise
* src/ejabberd_zlib/Makefile.in: Likewise
* src/mod_proxy65/Makefile.in: Likewise
* src/tls/Makefile.in: Likewise
* src/odbc/Makefile.in: Likewise

SVN Revision: 775
 2007-05-29 14:31:12 +00:00
Mickaël Rémond
d9e8e07ffd * src/mod_vcard_ldap.erl: LDAP server pool support (thanks to Evgeniy 
Khramtsov) (EJAB-175)
* src/eldap/Makefile.in: Likewise
* src/ejabberd_auth_ldap.erl: Likewise
* src/eldap_pool.erl: Likewise

* src/eldap/eldap_utils.erl: Implemented LDAP domain substitution (EJAB-177)

* src/eldap/eldap.erl: Implemented queue to avoid bind deadlock under
heavy load (thanks to Evgeniy Khramtsov)  (EJAB-176)
* src/eldap/eldap.hrl: Likewise

SVN Revision: 716
 2007-01-27 16:40:37 +00:00
Mickaël Rémond
9fed4c5eba * src/eldap/Makefile.win32: fix build error on Windows. 
SVN Revision: 714
 2007-01-25 15:54:10 +00:00
Alexey Shchepin
661a34ccfc * src/eldap/eldap.erl: Bugfix (thanks to Evgeniy Khramtsov) 
* src/ejabberd_sm.erl: The max_user_sessions option is now
configured via access rule
* src/ejabberd.cfg.example: Likewise

SVN Revision: 680
 2006-11-23 06:34:05 +00:00
Mickaël Rémond
2cdb82260d * src/eldap_utils.erl: Fixed missing export (EJAB-154). 
SVN Revision: 671
 2006-11-04 15:33:20 +00:00
Mickaël Rémond
d5792ed75e * src/ejabberd_auth_ldap.erl: LDAP authentication now allows to 
match on several alternative attributes.
* src/mod_vcard_ldap.erl: Likewise.
* doc/guide.tex: Updated.
* eldap_utils.erl: Refactoring.
* src/eldap/Makefile.in: Likewise.

SVN Revision: 661
 2006-10-17 12:35:47 +00:00
Alexey Shchepin
bb4f9f63b9 * src/eldap/eldap.erl: Enable the keepalive socket option (thanks 
to Evgeniy Khramtsov)

* src/ejabberd_auth_ldap.erl: Now uses two LDAP connections
(thanks to Evgeniy Khramtsov)

* src/eldap/eldap_filter.erl: Bugfix (thanks to Evgeniy Khramtsov)
* src/mod_vcard_ldap.erl: Likewise

SVN Revision: 621
 2006-09-23 04:28:03 +00:00