* src/ejabberd_c2s.erl: Send new id for each new stream inside one

session (thanks to Maxim Ryazanov)

* src/tls/tls_drv.c: Now reads all certificates from certificate
file instead of reading only first one (thanks to Karl-Johan
Karlsson)

* examples/transport-configs/init-scripts/jabber-gg-transport:
Fixed typo (thanks to Sander Devrieze)

SVN Revision: 305

diff --git a/.cvslog b/.cvslog
new file mode 100644 (file)
index 0000000..dd13d46
--- /dev/null
+++ b/.cvslog
@@ -0,0 +1,3 @@
+jabber://aleksey@jabber.ru
+jabber://sgolovan@nes.ru
+ryazanov@gmail.com

diff --git a/ChangeLog b/ChangeLog
index d276042e463f645b121397293477767b8ac898da..8fdd0eec6cefd304f9851e5a09a5c897e9bcda67 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2005-04-09  Alexey Shchepin  <alexey@sevcom.net>
+
+       * src/ejabberd_c2s.erl: Send new id for each new stream inside one
+       session (thanks to Maxim Ryazanov)
+
+       * src/tls/tls_drv.c: Now reads all certificates from certificate
+       file instead of reading only first one (thanks to Karl-Johan
+       Karlsson)
+
+2005-04-06  Alexey Shchepin  <alexey@sevcom.net>
+
+       * examples/transport-configs/init-scripts/jabber-gg-transport:
+       Fixed typo (thanks to Sander Devrieze)
+
 2005-04-05  Alexey Shchepin  <alexey@sevcom.net>
 
        * examples/transport-configs/configs/msn-transport.xml: Fixed typo

diff --git a/examples/transport-configs/init-scripts/jabber-gg-transport b/examples/transport-configs/init-scripts/jabber-gg-transport
index 17718fb9308b1e10822e13f9f912bdc669ec20d2..269685d0d0de95a60b96249d08dfebc8446fe1b0 100755 (executable)
--- a/examples/transport-configs/init-scripts/jabber-gg-transport
+++ b/examples/transport-configs/init-scripts/jabber-gg-transport
@@ -33,8 +33,7 @@ case "$1" in
   stop)
        echo "Stopping $NAME."
        killall $NAME &
-# BUG REPORTEN hiervoor: bij afsluiten blijft telkens PID-bestand achter
-       rm $HOME/../../../var/run/jabber/jabber-gg-transport.pid
+       rm /var/run/jabber/jabber-gg-transport.pid
         ;;
 
   restart|reload)

diff --git a/src/tls/tls_drv.c b/src/tls/tls_drv.c
index f320ee31f8dad1fb2f23ae475c04af0c3ccc17b5..fa47ed3f66ccaca2e8d832b83776988893549dfe 100644 (file)
--- a/src/tls/tls_drv.c
+++ b/src/tls/tls_drv.c
@@ -80,8 +80,8 @@ static int tls_drv_control(ErlDrvData handle,
         d->ctx = SSL_CTX_new(SSLv23_server_method());
         die_unless(d->ctx, "SSL_CTX_new failed");
 
-        res = SSL_CTX_use_certificate_file(d->ctx, buf, SSL_FILETYPE_PEM);
-        die_unless(res > 0, "SSL_CTX_use_certificate_file failed");
+        res = SSL_CTX_use_certificate_chain_file(d->ctx, buf);
+        die_unless(res > 0, "ssl_ctx_use_certificate_chain_file failed");
 
         res = SSL_CTX_use_PrivateKey_file(d->ctx, buf, SSL_FILETYPE_PEM);
         die_unless(res > 0, "SSL_CTX_use_PrivateKey_file failed");