removed vulnerable version 2.2.16
This commit is contained in:
parent
c758574c05
commit
03f09c65da
5 changed files with 0 additions and 262 deletions
|
@ -1,51 +0,0 @@
|
|||
diff -ur jabberd-2.2.16/util/log.c jabberd-2.2.16_patched/util/log.c
|
||||
--- jabberd-2.2.16/util/log.c 2012-05-04 14:51:08.000000000 +0000
|
||||
+++ jabberd-2.2.16_patched/util/log.c 2012-07-25 08:10:49.004560934 +0000
|
||||
@@ -223,12 +223,12 @@
|
||||
debug_flag = v;
|
||||
}
|
||||
|
||||
-int set_debug_log_from_config(config_t c)
|
||||
+void set_debug_log_from_config(config_t c)
|
||||
{
|
||||
return set_debug_file(config_get_one(c, "log.debug", 0));
|
||||
-};
|
||||
+}
|
||||
|
||||
-JABBERD2_API int set_debug_file(const char *filename)
|
||||
+JABBERD2_API void set_debug_file(const char *filename)
|
||||
{
|
||||
// Close debug output file but not stderr
|
||||
if (debug_log_target != 0 &&
|
||||
@@ -255,7 +255,7 @@
|
||||
// set stderr
|
||||
debug_log_target = stderr;
|
||||
}
|
||||
-};
|
||||
+}
|
||||
|
||||
#else /* DEBUG */
|
||||
void debug_log(const char *file, int line, const char *msgfmt, ...)
|
||||
@@ -263,4 +263,7 @@
|
||||
|
||||
void set_debug_flag(int v)
|
||||
{ }
|
||||
+
|
||||
+void set_debug_log_from_config(config_t c)
|
||||
+{ }
|
||||
#endif
|
||||
diff -ur jabberd-2.2.16/util/util.h jabberd-2.2.16_patched/util/util.h
|
||||
--- jabberd-2.2.16/util/util.h 2012-05-04 14:51:08.000000000 +0000
|
||||
+++ jabberd-2.2.16_patched/util/util.h 2012-07-25 08:11:19.612564607 +0000
|
||||
@@ -414,9 +414,9 @@
|
||||
JABBERD2_API int get_debug_flag(void);
|
||||
JABBERD2_API void set_debug_flag(int v);
|
||||
JABBERD2_API void debug_log(const char *file, int line, const char *msgfmt, ...);
|
||||
-JABBERD2_API int set_debug_file(const char *filename);
|
||||
+JABBERD2_API void set_debug_file(const char *filename);
|
||||
|
||||
-JABBERD2_API int set_debug_log_from_config(config_t c);
|
||||
+JABBERD2_API void set_debug_log_from_config(config_t c);
|
||||
|
||||
#define ZONE __FILE__,__LINE__
|
||||
#define MAX_DEBUG 8192
|
|
@ -1,83 +0,0 @@
|
|||
#!/sbin/runscript
|
||||
# Copyright 1999-2008 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/net-im/jabberd2/files/jabberd2-2.2.16.init,v 1.1 2009/05/08 15:24:09 gentoofan23 Exp $
|
||||
|
||||
depend() {
|
||||
need net
|
||||
use mysql postgresql slapd
|
||||
provide jabber-server
|
||||
}
|
||||
|
||||
stopJabberServices() {
|
||||
|
||||
eindent
|
||||
for pidfile in /var/run/jabber/*.pid; do
|
||||
if [ -f "${pidfile}" ]; then
|
||||
service=$(basename ${pidfile} .pid)
|
||||
ebegin "Stopping ${service}"
|
||||
start-stop-daemon \
|
||||
--stop \
|
||||
--pidfile ${pidfile}
|
||||
eend $?
|
||||
fi
|
||||
done
|
||||
eoutdent
|
||||
|
||||
}
|
||||
|
||||
start() {
|
||||
|
||||
einfo "Starting Jabber Server ..."
|
||||
local services
|
||||
services=$(grep -v ^# /etc/jabber/jabberd.cfg | grep '..*' | awk '{print $1 ":" $2}')
|
||||
eindent
|
||||
|
||||
if [ ! -d /var/run/jabber ] ; then
|
||||
mkdir /var/run/jabber || die "Can't create run directory /var/run/jabber"
|
||||
chown jabber:jabber /var/run/jabber
|
||||
fi
|
||||
|
||||
for service in ${services}; do
|
||||
|
||||
cfgfile=$(echo ${service} | cut -d ':' -f 2)
|
||||
service=$(echo ${service} | cut -d ':' -f 1)
|
||||
if [ ! -f "${cfgfile}" ]; then
|
||||
if [ -f "/etc/jabber/${service}.xml" ]; then
|
||||
cfgfile="/etc/jabber/${service}.xml"
|
||||
else
|
||||
eerror "Can't find: ${cfgfile} or default /etc/jabber/${service}.xml"
|
||||
stopJabberServices
|
||||
return 1
|
||||
fi
|
||||
fi
|
||||
|
||||
executable=/usr/bin/${service}
|
||||
|
||||
if [ ! -f "${executable}" ]; then
|
||||
eerror "Can't find executable: ${executable}"
|
||||
stopJabberServices
|
||||
return 1
|
||||
fi
|
||||
|
||||
ebegin "Starting ${service} (${cfgfile})"
|
||||
start-stop-daemon \
|
||||
--background \
|
||||
--start \
|
||||
--user jabber:jabber \
|
||||
--exec /usr/bin/${service} \
|
||||
--pid /var/run/jabber/$(basename ${cfgfile%.xml}).pid \
|
||||
-- -c ${cfgfile}
|
||||
eend $?
|
||||
|
||||
done
|
||||
eoutdent
|
||||
|
||||
}
|
||||
|
||||
stop() {
|
||||
|
||||
einfo "Stopping Jabber Server"
|
||||
stopJabberServices
|
||||
|
||||
}
|
|
@ -1,6 +0,0 @@
|
|||
#%PAM-1.0
|
||||
|
||||
auth required pam_nologin.so
|
||||
auth include system-auth
|
||||
account include system-auth
|
||||
session include system-auth
|
Loading…
Add table
Add a link
Reference in a new issue