24
1
mirror of https://github.com/processone/ejabberd.git synced 2024-09-27 14:30:55 +02:00
Commit Graph

1112 Commits

Author SHA1 Message Date
Badlop
1e3faf8bd9 Merge 1998 from trunk.
* src/ejabberd_sm.erl: Partially retract SVN r1976
EJAB-300 (EJAB-890). Check default privacy list when account, not
a specific session, receives a presence subscription
stanza (EJAB-300).
* src/ejabberd_c2s.erl: Likewise

SVN Revision: 1999
2009-03-24 18:02:13 +00:00
Badlop
3fce8ed570 Fix mistake when calling win32_dns.
SVN Revision: 1990
2009-03-11 18:36:27 +00:00
Christophe Romain
b6abe1b926 fix typo in previous patch backport
SVN Revision: 1988
2009-03-10 21:10:42 +00:00
Badlop
8f41436cd8 * src/tls/tls_drv.c: Fix encryption problem for ejabberd_http
after timeout (thanks to Alexey Shchepin)(EJAB-880)

SVN Revision: 1986
2009-03-10 15:21:36 +00:00
Christophe Romain
b0864396ec typo fix on roster access_model
SVN Revision: 1983
2009-03-10 12:08:12 +00:00
Christophe Romain
dcac4ed8c8 Fix PEP with other domains and s2s (EJAB-825)
SVN Revision: 1981
2009-03-10 10:46:19 +00:00
Badlop
74c202a714 * src/tls/tls_drv.c: Fix to support OpenSSL older than
0.9.8f (EJAB-877)(thanks to Jonathan Schleifer)
* doc/guide.tex: It is again supported OpenSSL older than 0.9.8f
* doc/guide.html: Likewise

SVN Revision: 1979
2009-03-09 19:17:53 +00:00
Badlop
10b22b52ef Merge 1925 from trunk.
* src/mod_proxy65/mod_proxy65_service.erl: if an ip option is not
defined, the module takes an IP address of a local
hostname (thanks to Evgeniy Khramtsov)

SVN Revision: 1978
2009-03-09 14:44:46 +00:00
Badlop
a6145084f1 * src/ejabberd_c2s.erl: Enforce privacy rules also for
subscription requests (EJAB-300)
* src/ejabberd_sm.erl: Likewise

SVN Revision: 1976
2009-03-07 08:59:26 +00:00
Badlop
367002f89a 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
75a8ebf293 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
4e17b1463b 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
Badlop
5c73d160cc Merge 1682 from trunk.
* src/eldap/Makefile.in: added +optimize and +driver compilation
options (thanks to Evgeniy Khramtsov)
* src/eldap/Makefile.win32: Likewise

SVN Revision: 1971
2009-03-06 11:34:27 +00:00
Badlop
ac69fbb24d * src/ejabberd_app.erl: In a Windows machine, explicitly add the
nameservers, as it seems Erlang does not do itself (EJAB-860)
* src/win32_dns.erl: Get name servers from Windows registy (thanks
to Geoff Cant)

SVN Revision: 1968
2009-03-05 20:03:18 +00:00
Badlop
5374c0b069 * src/ejabberd_auth.erl: If anonymous auth is enabled, when
checking if the account already exists in other auth methods, take
into account if the auth method failed (EJAB-882)
* src/ejabberd_auth_anonymous.erl: Likewise
* src/ejabberd_auth_external.erl: Likewise
* src/ejabberd_auth_internal.erl: Likewise
* src/ejabberd_auth_ldap.erl: Likewise
* src/ejabberd_auth_odbc.erl: Likewise
* src/ejabberd_auth_pam.erl: Likewise

SVN Revision: 1966
2009-03-04 18:34:02 +00:00
Christophe Romain
e4db030f4e Allow node creation without configure item
SVN Revision: 1962
2009-03-04 01:10:44 +00:00
Christophe Romain
abbfa96fc4 backport typo fix from trunk
SVN Revision: 1959
2009-03-04 00:01:19 +00:00
Christophe Romain
55942d1f4a Add roster subscriptions handling and make PEP events sent to all resources
SVN Revision: 1957
2009-03-03 22:42:52 +00:00
Badlop
06abf6331b Merge fix from trunk r1910
* src/web/ejabberd_http.erl: Added a workaround for inet:peername
returning 'ebadf'

SVN Revision: 1928
2009-02-27 16:19:19 +00:00
Badlop
8be6b8df76 Merge fix from trunk r1190
* src/cyrsasl_digest.erl: Unquote backslash in DIGEST-MD5 quoted
strings (EJAB-304)

SVN Revision: 1927
2009-02-27 15:57:35 +00:00
Badlop
a1e7e737bf * src/tls/tls_drv.c: S2S connection with STARTTLS fails to Gtalk
and recent Openfire (thanks to Philipp Hancke)(EJAB-877)

SVN Revision: 1926
2009-02-27 15:42:27 +00:00
Christophe Romain
dcb05c4061 Do not call mod_caps:clear_caps as it breaks PubSub/PEP (EJAB-854)
SVN Revision: 1911
2009-02-23 15:51:01 +00:00
Badlop
6ea29663a3 Merge r1880 from trunk:
* src/mod_muc/mod_muc_room.erl: Owner of a password protected room
must provide the password, like other participants (EJAB-867)

SVN Revision: 1906
2009-02-21 09:37:05 +00:00
Badlop
ad48607327 Merge r1879 from trunk:
* src/mod_muc/mod_muc_log.erl: Prevent XSS in MUC logs by
linkifying only a few known protocols (EJAB-850)

SVN Revision: 1905
2009-02-21 09:30:23 +00:00
Badlop
fea7eac245 Merge r1877 from trunk:
* src/mod_roster.erl: When account is deleted, cancel presence
subscription for all roster items (EJAB-790)
* src/mod_roster_odbc.erl: Likewise

SVN Revision: 1904
2009-02-21 09:28:58 +00:00
Badlop
b1f3d56beb Merge r1874 from trunk:
* src/mod_shared_roster.erl: Fix bug: a pending subscription
request, and later the requester added to the roster due to a
shared roster group, that request could neither be accepted or
rejected (thanks to Brian Cully)(EJAB-869)

SVN Revision: 1903
2009-02-21 09:27:27 +00:00
Badlop
7c6ccbb744 Merge r1864 from trunk:
* src/mod_pubsub/mod_pubsub.erl: The table pubsub_node in ejabberd
older than 2.0.2 had indexes for parentid and type. This is not
required since ejabberd 2.0.2, so those indexes can be
deleted. (EJAB-669)

SVN Revision: 1902
2009-02-21 09:26:12 +00:00
Badlop
f6ee802960 Merge r1850 from trunk:
* src/odbc/mysql.sql: Fix complain about comment syntax
* src/odbc/pg.sql: Likewise

SVN Revision: 1897
2009-02-21 09:19:56 +00:00
Badlop
cd29a77759 Merge r1822 and partial r1834 from trunk:
* src/mod_privacy.erl: Privacy list items must be processed in the
specified order (EJAB-848)
* src/mod_privacy_odbc.erl: Likewise

SVN Revision: 1895
2009-02-21 09:15:43 +00:00
Badlop
677387bc80 Merge r1666 from trunk:
* src/ejabberd_c2s.erl: Ensure unique ID in roster push (EJAB-721)
* src/mod_roster.erl: Likewise
* src/mod_roster_odbc.erl: Likewise
* src/mod_shared_roster.erl: Likewise

SVN Revision: 1894
2009-02-21 09:12:59 +00:00
Christophe Romain
f362fe93ec fix nodetree plugin resolver
SVN Revision: 1888
2009-02-19 11:24:26 +00:00
Christophe Romain
9b6343faa4 prevent from calling get_vh_registered_users/2 when not available
SVN Revision: 1870
2009-02-13 13:30:20 +00:00
Mickaël Rémond
d87336e12e * src/tls/Makefile.win32: Windows compilation support.
* src/tls/tls_drv.c: Likewise.
* src/tls/stdint.h: Likewise.
* doc/guide.tex: Update Erlang version in Windows compilation documentation.

SVN Revision: 1817
2009-01-13 16:36:10 +00:00
Badlop
32805c3ba1 * src/msgs/pl.po: Fix typo (thanks to Apag0r)(EJAB-844)
SVN Revision: 1814
2009-01-12 23:47:07 +00:00
Badlop
19966a7353 * doc/guide.tex: Update copyright date 2008 to 2009 (EJAB-842)
* doc/guide.html: Likewise
* src/*/*.erl: Likewise
* src/*/*.erl: Remove unneeded blankspaces in license text

SVN Revision: 1805
2009-01-12 14:52:59 +00:00
Christophe Romain
be99c4b0eb prevent unauthorized entity to gain none-affiliation for given entity
SVN Revision: 1801
2009-01-11 04:07:39 +00:00
Christophe Romain
da893f4293 fix owners cache and fix unsubscribe permissions (EJAB-840)
SVN Revision: 1798
2009-01-11 01:41:22 +00:00
Christophe Romain
6e04bcbbf8 fix unsubscription of full jid subscribed node (EJAB-839)
SVN Revision: 1793
2009-01-10 13:35:34 +00:00
Badlop
048b1a5db3 * src/web/ejabberd_web_admin.erl: New appearance of WebAdmin logo,
fixed logo-fill.

SVN Revision: 1788
2009-01-09 13:42:15 +00:00
Badlop
012a0529a8 * src/mod_configure.erl: Fix access check for vhost configuration
SVN Revision: 1787
2009-01-09 00:39:57 +00:00
Christophe Romain
553b402d03 fix EJAB-701 and EJAB-836
SVN Revision: 1786
2009-01-08 21:53:23 +00:00
Mickaël Rémond
efaf182d54 * src/ejabberd_listener.erl: Define send timeout option to avoid blocking on socket send (EJAB-746).
* src/ejabberd_s2s_out.erl: Likewise.

SVN Revision: 1785
2009-01-08 21:01:27 +00:00
Badlop
2c5b0fb896 * src/msgs/ru.po: Fix typo (thanks to Dominges)
* src/msgs/ru.msg: Likewise

SVN Revision: 1776
2009-01-06 15:09:53 +00:00
Alexey Shchepin
04ff0c2f6f * src/tls/tls_drv.c: Added a flag to avoid certificate validation
* src/tls/tls.erl: Likewise
* src/ejabberd_c2s.erl: Likewise

SVN Revision: 1775
2009-01-05 17:27:30 +00:00
Badlop
b32793efcf * src/*.erl: Fix EDoc comments
SVN Revision: 1772
2009-01-03 21:31:36 +00:00
Christophe Romain
ee02b0b57f PubSub cleanup, EJAB-827 fix, EJAB-701 partial fix
SVN Revision: 1765
2009-01-03 00:23:58 +00:00
Mickaël Rémond
5141edd757 * src/ejabberd_c2s.erl: Remove useless comment and port Alexey fix to 2.0.x branch.
SVN Revision: 1764
2008-12-29 12:06:34 +00:00
Mickaël Rémond
c0cc236196 * src/ejabberd_c2s.erl: Add resource to the from packet attribute if missing (EJAB-812).
SVN Revision: 1760
2008-12-28 12:23:20 +00:00
Badlop
3a3a89007a * src/aclocal.m4: Fixes in configure script: fix
disable-disable_zlib and disable-pam; in case of problems, PAM
verification aborts with error instead of warning. (EJAB-787)
* src/configure.ac: Likewise
* src/configure: Likewise

SVN Revision: 1754
2008-12-24 12:03:13 +00:00
Badlop
919914d8ac * src/acl.erl: New ACL: shared_group (thanks to Maxim Ryazanov)
* doc/guide.tex: Likewise

* src/mod_shared_roster.erl: Push new group members when
registered or manually added to group: EJAB-730 EJAB-731 EJAB-732
EJAB-767 EJAB-794. When user is added to group, push it to other
members, and other members to it. When user is removed from group,
push deletion to other members, and other members to it. When user
is registered, push him to members of group @all@. When user is
deleted, push deletion to members of group @all@. Document several
functions in mod_shared_roster.

* src/ejabberd_auth.erl: Rename hook user_registered to
register_user, for name consistency with the widely used hook
remove_user. Run hook register_user in ejabberd_auth, so it's run
when account is created with any method. Run hook remove_user in
ejabberd_auth, so it's run when account is deleted with any
method.
* src/ejabberd_auth_internal.erl: Likewise
* src/ejabberd_auth_ldap.erl: Likewise
* src/ejabberd_auth_odbc.erl: Likewise
* src/ejabberd_auth_pam.erl: Likewise
* src/mod_register.erl: Likewise

SVN Revision: 1753
2008-12-23 19:24:45 +00:00