3 changed files with 302 additions and 123 deletions
@ -1,37 +1,177 @@
|
||||
Index: jabberd/jabberd.h
|
||||
--- jabberd/jabberd.h.orig 2003-11-13 12:22:42.000000000 +0100
|
||||
+++ jabberd/jabberd.h 2003-12-17 09:29:41.000000000 +0100
|
||||
@@ -30,7 +30,7 @@
|
||||
#include "lib/lib.h"
|
||||
#include <pth.h>
|
||||
#ifdef HAVE_SSL
|
||||
-#include <ssl.h>
|
||||
+#include <openssl/ssl.h>
|
||||
#endif /* HAVE_SSL */
|
||||
|
||||
#define VERSION "1.4.3"
|
||||
Index: jabberd/mio_ssl.c
|
||||
--- jabberd/mio_ssl.c.orig 2003-11-08 01:09:50.000000000 +0100
|
||||
+++ jabberd/mio_ssl.c 2003-12-17 09:29:28.000000000 +0100
|
||||
@@ -1,6 +1,6 @@
|
||||
#include "jabberd.h"
|
||||
#ifdef HAVE_SSL
|
||||
-#include <err.h>
|
||||
+#include <openssl/err.h>
|
||||
|
||||
HASHTABLE ssl__ctxs;
|
||||
extern int mio__errno;
|
||||
Index: jsm/modules/mod_auth_crypt.c
|
||||
--- jsm/modules/mod_auth_crypt.c.orig 2003-10-27 20:16:50.000000000 +0100
|
||||
+++ jsm/modules/mod_auth_crypt.c 2003-12-17 09:28:50.000000000 +0100
|
||||
@@ -28,7 +28,9 @@
|
||||
*
|
||||
* --------------------------------------------------------------------------*/
|
||||
#include "jsm.h"
|
||||
-#include "crypt.h"
|
||||
+#ifndef __FreeBSD__
|
||||
+#include <crypt.h>
|
||||
+#endif
|
||||
|
||||
#define HASH_CRYPT 1
|
||||
#define HASH_SHA1 2
|
||||
Index: util/util.h
|
||||
--- util/util.h.orig 2004-05-31 23:31:06 +0200
|
||||
+++ util/util.h 2004-09-22 21:26:44 +0200
|
||||
@@ -30,6 +30,8 @@
|
||||
#include <time.h>
|
||||
#include <errno.h>
|
||||
#include <assert.h>
|
||||
+#include <sys/types.h>
|
||||
+#include <sys/socket.h>
|
||||
|
||||
#ifdef HAVE_NETINET_IN_H
|
||||
# include <netinet/in.h>
|
||||
Index: etc/c2s.xml.dist.in
|
||||
--- etc/c2s.xml.dist.in.orig 2004-04-26 07:42:53 +0200
|
||||
+++ etc/c2s.xml.dist.in 2004-09-22 21:48:33 +0200
|
||||
@@ -46,18 +46,16 @@
|
||||
</router>
|
||||
|
||||
<!-- Log configuration - type is "syslog", "file" or "stdout" -->
|
||||
- <log type='syslog'>
|
||||
+ <log type='file'>
|
||||
<!-- If logging to syslog, this is the log ident -->
|
||||
- <ident>jabberd/c2s</ident>
|
||||
+ <!-- <ident>jabberd/c2s</ident> -->
|
||||
|
||||
<!-- If logging to syslog, this is the log facility
|
||||
(local0 - local7) [default: local3] -->
|
||||
- <facility>local3</facility>
|
||||
+ <!-- <facility>local3</facility> -->
|
||||
|
||||
<!-- If logging to file, this is the filename of the logfile -->
|
||||
- <!--
|
||||
<file>@localstatedir@/jabberd/log/c2s.log</file>
|
||||
- -->
|
||||
</log>
|
||||
|
||||
<!-- Local network configuration -->
|
||||
@@ -78,7 +76,7 @@
|
||||
<!-- <id realm='company'>localhost</id> -->
|
||||
|
||||
<!-- IP address to bind to (default: 0.0.0.0) -->
|
||||
- <ip>0.0.0.0</ip>
|
||||
+ <ip>127.0.0.1</ip>
|
||||
|
||||
<!-- Port to bind to, or 0 to disable unencrypted access to the
|
||||
server (default: 5222) -->
|
||||
@@ -206,7 +204,7 @@
|
||||
<!-- Authentication/registration database configuration -->
|
||||
<authreg>
|
||||
<!-- Backend module to use -->
|
||||
- <module>mysql</module>
|
||||
+ <module>db</module>
|
||||
|
||||
<!-- Registration configuration -->
|
||||
<register>
|
||||
Index: etc/resolver.xml.dist.in
|
||||
--- etc/resolver.xml.dist.in.orig 2004-04-01 06:56:55 +0200
|
||||
+++ etc/resolver.xml.dist.in 2004-09-22 21:48:58 +0200
|
||||
@@ -46,18 +46,16 @@
|
||||
</router>
|
||||
|
||||
<!-- Log configuration - type is "syslog", "file" or "stdout" -->
|
||||
- <log type='syslog'>
|
||||
+ <log type='file'>
|
||||
<!-- If logging to syslog, this is the log ident -->
|
||||
- <ident>jabberd/resolver</ident>
|
||||
+ <!-- <ident>jabberd/resolver</ident> -->
|
||||
|
||||
<!-- If logging to syslog, this is the log facility
|
||||
(local0 - local7) [default: local3] -->
|
||||
- <facility>local3</facility>
|
||||
+ <!-- <facility>local3</facility> -->
|
||||
|
||||
<!-- If logging to file, this is the filename of the logfile -->
|
||||
- <!--
|
||||
<file>@localstatedir@/jabberd/log/resolver.log</file>
|
||||
- -->
|
||||
</log>
|
||||
|
||||
<!-- SRV records will be resolved in the following order. The first
|
||||
Index: etc/router.xml.dist.in
|
||||
--- etc/router.xml.dist.in.orig 2004-04-01 06:56:55 +0200
|
||||
+++ etc/router.xml.dist.in 2004-09-22 21:49:28 +0200
|
||||
@@ -9,24 +9,22 @@
|
||||
<pidfile>@localstatedir@/jabberd/pid/router.pid</pidfile>
|
||||
|
||||
<!-- Log configuration - type is "syslog", "file" or "stdout" -->
|
||||
- <log type='syslog'>
|
||||
+ <log type='file'>
|
||||
<!-- If logging to syslog, this is the log ident -->
|
||||
- <ident>jabberd/router</ident>
|
||||
+ <!-- <ident>jabberd/router</ident> -->
|
||||
|
||||
<!-- If logging to syslog, this is the log facility
|
||||
(local0 - local7) [default: local3] -->
|
||||
- <facility>local3</facility>
|
||||
+ <!-- <facility>local3</facility> -->
|
||||
|
||||
<!-- If logging to file, this is the filename of the logfile -->
|
||||
- <!--
|
||||
<file>@localstatedir@/jabberd/log/router.log</file>
|
||||
- -->
|
||||
</log>
|
||||
|
||||
<!-- Local network configuration -->
|
||||
<local>
|
||||
<!-- IP address to bind to (default: 0.0.0.0) -->
|
||||
- <ip>0.0.0.0</ip>
|
||||
+ <ip>127.0.0.1</ip>
|
||||
|
||||
<!-- Port to bind to (default: 5347) -->
|
||||
<port>5347</port>
|
||||
Index: etc/s2s.xml.dist.in
|
||||
--- etc/s2s.xml.dist.in.orig 2004-04-21 15:29:27 +0200
|
||||
+++ etc/s2s.xml.dist.in 2004-09-22 21:50:02 +0200
|
||||
@@ -56,25 +56,23 @@
|
||||
</router>
|
||||
|
||||
<!-- Log configuration - type is "syslog", "file" or "stdout" -->
|
||||
- <log type='syslog'>
|
||||
+ <log type='file'>
|
||||
<!-- If logging to syslog, this is the log ident -->
|
||||
- <ident>jabberd/s2s</ident>
|
||||
+ <!-- <ident>jabberd/s2s</ident> -->
|
||||
|
||||
<!-- If logging to syslog, this is the log facility
|
||||
(local0 - local7) [default: local3] -->
|
||||
- <facility>local3</facility>
|
||||
+ <!-- <facility>local3</facility> -->
|
||||
|
||||
<!-- if logging to file, this is the filename of the logfile -->
|
||||
- <!--
|
||||
<file>@localstatedir@/jabberd/log/s2s.log</file>
|
||||
- -->
|
||||
</log>
|
||||
|
||||
<!-- Local network configuration -->
|
||||
<local>
|
||||
<!-- IP and port to listen for incoming s2s connections on
|
||||
(default: 0.0.0.0, 5269) -->
|
||||
- <ip>0.0.0.0</ip>
|
||||
+ <ip>127.0.0.1</ip>
|
||||
<port>5269</port>
|
||||
|
||||
<!-- Helper DNS resolver component - if this component is not
|
||||
Index: etc/sm.xml.dist.in
|
||||
--- etc/sm.xml.dist.in.orig 2004-04-02 06:32:31 +0200
|
||||
+++ etc/sm.xml.dist.in 2004-09-22 21:50:56 +0200
|
||||
@@ -49,24 +49,22 @@
|
||||
</router>
|
||||
|
||||
<!-- Log configuration - type is "syslog", "file" or "stdout" -->
|
||||
- <log type='syslog'>
|
||||
+ <log type='file'>
|
||||
<!-- If logging to syslog, this is the log ident -->
|
||||
- <ident>jabberd/sm</ident>
|
||||
+ <!-- <ident>jabberd/sm</ident> -->
|
||||
|
||||
<!-- If logging to syslog, this is the log facility
|
||||
(local0 - local7) [default: local3] -->
|
||||
- <facility>local3</facility>
|
||||
+ <!-- <facility>local3</facility> -->
|
||||
|
||||
<!-- If logging to file, this is the filename of the logfile -->
|
||||
- <!--
|
||||
<file>@localstatedir@/jabberd/log/sm.log</file>
|
||||
- -->
|
||||
</log>
|
||||
|
||||
<!-- Storage database configuration -->
|
||||
<storage>
|
||||
<!-- By default, we use the MySQL driver for all storage -->
|
||||
- <driver>mysql</driver>
|
||||
+ <driver>db</driver>
|
||||
|
||||
<!-- Its also possible to explicitly list alternate drivers for
|
||||
specific data types. -->
|
||||
|
||||
Loading…
Reference in new issue