comparison: jabberd/jabberd.patch
jabberd/jabberd.patch
- changeset 540
- 6becb64fe77d
- parent 363
- 641cacc76b02
- child 541
- 869d6847b13e
equal
deleted
inserted
replaced
| 3:5b0852600707 | 4:c338a50544c7 |
|---|---|
| 21 <file>@localstatedir@/jabberd/log/c2s.log</file> | 21 <file>@localstatedir@/jabberd/log/c2s.log</file> |
| 22 - --> | 22 - --> |
| 23 </log> | 23 </log> |
| 24 | 24 |
| 25 <!-- Local network configuration --> | 25 <!-- Local network configuration --> |
| 26 @@ -149,7 +147,7 @@ | 26 @@ -137,7 +135,7 @@ |
| 27 <id password-change='mu' /> --> | 27 <id password-change='true' /> --> |
| 28 | 28 |
| 29 <!-- IP address to bind to (default: 0.0.0.0) --> | 29 <!-- IP address to bind to (default: 0.0.0.0) --> |
| 30 - <ip>0.0.0.0</ip> | 30 - <ip>0.0.0.0</ip> |
| 31 + <ip>127.0.0.1</ip> | 31 + <ip>127.0.0.1</ip> |
| 32 | 32 |
| 33 <!-- Port to bind to, or 0 to disable unencrypted access to the | 33 <!-- Port to bind to, or 0 to disable unencrypted access to the |
| 34 server (default: 5222) --> | 34 server (default: 5222) --> |
| 35 @@ -331,7 +329,7 @@ | |
| 36 <path>@pkglibdir@</path> | |
| 37 | |
| 38 <!-- Backend module to use --> | |
| 39 - <module>sqlite</module> | |
| 40 + <module>db</module> | |
| 41 | |
| 42 <!-- Available authentication mechanisms --> | |
| 43 <mechanisms> | |
| 35 Index: etc/router.xml.dist.in | 44 Index: etc/router.xml.dist.in |
| 36 --- etc/router.xml.dist.in.orig 2009-06-30 11:38:16 +0200 | 45 --- etc/router.xml.dist.in.orig 2009-06-30 11:38:16 +0200 |
| 37 +++ etc/router.xml.dist.in 2009-06-30 20:45:06 +0200 | 46 +++ etc/router.xml.dist.in 2009-06-30 20:45:06 +0200 |
| 38 @@ -8,24 +8,22 @@ | 47 @@ -8,24 +8,22 @@ |
| 39 <pidfile>@localstatedir@/jabberd/pid/router.pid</pidfile> | 48 <pidfile>@localstatedir@/jabberd/pid/router.pid</pidfile> |
| 115 - <facility>local3</facility> | 124 - <facility>local3</facility> |
| 116 + <!-- <facility>local3</facility> --> | 125 + <!-- <facility>local3</facility> --> |
| 117 | 126 |
| 118 <!-- If logging to file, this is the filename of the logfile --> | 127 <!-- If logging to file, this is the filename of the logfile --> |
| 119 <!-- | 128 <!-- |
| 129 @@ -85,7 +85,7 @@ | |
| 130 <path>@pkglibdir@</path> | |
| 131 | |
| 132 <!-- By default, we use the SQLite driver for all storage --> | |
| 133 - <driver>sqlite</driver> | |
| 134 + <driver>db</driver> | |
| 135 | |
| 136 <!-- Its also possible to explicitly list alternate drivers for | |
| 137 specific data types. --> | |
| 120 Index: sm/mod_iq_time.c | 138 Index: sm/mod_iq_time.c |
| 121 --- sm/mod_iq_time.c.orig 2009-06-30 11:38:15 +0200 | 139 --- sm/mod_iq_time.c.orig 2009-06-30 11:38:15 +0200 |
| 122 +++ sm/mod_iq_time.c 2009-06-30 20:45:06 +0200 | 140 +++ sm/mod_iq_time.c 2009-06-30 20:45:06 +0200 |
| 123 @@ -39,6 +39,7 @@ | 141 @@ -39,6 +39,7 @@ |
| 124 static mod_ret_t _iq_time_pkt_sm(mod_instance_t mi, pkt_t pkt) | 142 static mod_ret_t _iq_time_pkt_sm(mod_instance_t mi, pkt_t pkt) |
| 139 snprintf(buf, 64, "%+03d:%02d", (int) tm->tm_gmtoff/(60*60), (int) tm->tm_gmtoff%(60*60)); | 157 snprintf(buf, 64, "%+03d:%02d", (int) tm->tm_gmtoff/(60*60), (int) tm->tm_gmtoff%(60*60)); |
| 140 #endif | 158 #endif |
| 141 Index: sm/mod_roster.c | 159 Index: sm/mod_roster.c |
| 142 --- sm/mod_roster.c.orig 2009-06-30 11:38:15 +0200 | 160 --- sm/mod_roster.c.orig 2009-06-30 11:38:15 +0200 |
| 143 +++ sm/mod_roster.c 2009-06-30 20:45:06 +0200 | 161 +++ sm/mod_roster.c 2009-06-30 20:45:06 +0200 |
| 144 @@ -708,6 +708,9 @@ | 162 @@ -635,6 +635,9 @@ |
| 145 if(user->sessions == NULL) | 163 if(user->sessions == NULL) |
| 146 return mod_PASS; | 164 return mod_PASS; |
| 147 | 165 |
| 148 + /* We have to free old packet - Lemming's memory leak fix */ | 166 + /* We have to free old packet - Lemming's memory leak fix */ |
| 149 + pkt_free(pkt); | 167 + pkt_free(pkt); |
| 161 +#include <sys/types.h> | 179 +#include <sys/types.h> |
| 162 +#include <sys/socket.h> | 180 +#include <sys/socket.h> |
| 163 | 181 |
| 164 #include <expat.h> | 182 #include <expat.h> |
| 165 | 183 |
| 166 Index: tools/jabberd.in | |
| 167 --- tools/jabberd.in.orig 2009-10-31 17:51:42.857115000 +0100 | |
| 168 +++ tools/jabberd.in 2009-10-31 18:07:52.095812899 +0100 | |
| 169 @@ -63,7 +63,7 @@ | |
| 170 | |
| 171 | |
| 172 #----------------------------------------------------------------------------- | |
| 173 -# Setup the jobs: router, sm, c2s, s2s | |
| 174 +# Setup the jobs: router, sm, c2s, s2s, mu-conference | |
| 175 #----------------------------------------------------------------------------- | |
| 176 $jobs{jabberd}->{prefix} = "JBRD"; | |
| 177 | |
| 178 @@ -83,12 +83,17 @@ | |
| 179 $jobs{s2s}->{config} = "$config_dir/s2s.xml"; | |
| 180 $jobs{s2s}->{prefix} = "S2S"; | |
| 181 | |
| 182 +$jobs{muc}->{cmd} = "$Bin/mu-conference"; | |
| 183 +$jobs{muc}->{config} = "$config_dir/muc.xml"; | |
| 184 +$jobs{muc}->{prefix} = "MUC"; | |
| 185 + | |
| 186 if ($config eq "internal") | |
| 187 { | |
| 188 $programs[0] = ["router"]; | |
| 189 $programs[1] = ["sm"]; | |
| 190 $programs[2] = ["c2s"]; | |
| 191 $programs[3] = ["s2s"]; | |
| 192 + $programs[4] = ["muc"]; | |
| 193 } | |
| 194 else | |
| 195 { |
