mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-26 00:55:14 +00:00
- Update to 1.5.9.3
PR: ports/79908 Submitted by: Johan van Selst <johans@stack.nl>
This commit is contained in:
parent
732e51da4a
commit
54edc6cde9
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=133342
@ -6,10 +6,10 @@
|
||||
#
|
||||
|
||||
PORTNAME= rwhois
|
||||
PORTVERSION= 1.5.7.3
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 1.5.9.3
|
||||
CATEGORIES= net ipv6
|
||||
MASTER_SITES= http://www.rwhois.net/ftp/older_releases/
|
||||
MASTER_SITES= http://www.rwhois.net/ftp/ \
|
||||
http://www.rwhois.net/ftp/older_releases/
|
||||
DISTNAME= ${PORTNAME}d-${PORTVERSION}
|
||||
|
||||
MAINTAINER= ports@FreeBSD.org
|
||||
@ -17,6 +17,8 @@ COMMENT= The Internic referral whois server
|
||||
|
||||
HAS_CONFIGURE= yes
|
||||
CONFIGURE_ARGS= --prefix=${PREFIX}/lib/rwhois
|
||||
MAKE_ENV= RWHOIS_ROOT_DIR=${PREFIX}/lib/rwhois
|
||||
MAKE_ARGS= -E RWHOIS_ROOT_DIR
|
||||
|
||||
BINOWN= bin
|
||||
BINGRP= bin
|
||||
|
@ -1,2 +1,2 @@
|
||||
MD5 (rwhoisd-1.5.7.3.tar.gz) = b3a1d951454afec598a7531919ce22a0
|
||||
SIZE (rwhoisd-1.5.7.3.tar.gz) = 452141
|
||||
MD5 (rwhoisd-1.5.9.3.tar.gz) = f815090232d76c81ffbd384632e6b9d2
|
||||
SIZE (rwhoisd-1.5.9.3.tar.gz) = 525436
|
||||
|
@ -1,11 +0,0 @@
|
||||
--- Makefile.in.orig Tue Jun 3 23:20:53 1997
|
||||
+++ Makefile.in Sat Nov 25 15:44:00 2000
|
||||
@@ -25,7 +25,7 @@
|
||||
BIN_SUBDIRS = server tools
|
||||
ALL_SUBDIRS = $(LIB_SUBDIRS) $(BIN_SUBDIRS) $(SAMPLE_DATA_DIR)
|
||||
|
||||
-all: libraries libwrap binaries
|
||||
+all: libraries binaries
|
||||
|
||||
libraries:
|
||||
@for dir in $(LIB_SUBDIRS); do \
|
@ -1,33 +0,0 @@
|
||||
--- server/Makefile.in.orig Fri May 12 01:10:25 2000
|
||||
+++ server/Makefile.in Sat Nov 25 15:27:16 2000
|
||||
@@ -9,7 +9,7 @@
|
||||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
bindir = $(exec_prefix)/bin
|
||||
-etcdir = $(exec_prefix)/etc
|
||||
+sbindir = $(exec_prefix)/sbin
|
||||
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
@@ -18,8 +18,8 @@
|
||||
COMMON_INC = -I$(srcdir)/../common
|
||||
COMMON_LIBS = -L../common -lrwcommon
|
||||
|
||||
-WRAP_INC = -I$(srcdir)../tools/tcpd_wrapper
|
||||
-WRAP_LIBS = -L../tools/tcpd_wrapper -lwrap
|
||||
+WRAP_INC = -I${LOCALBASE}/include
|
||||
+WRAP_LIBS = -L${LOCALBASE}/lib -lwrap
|
||||
|
||||
MKDB_INC = -I$(srcdir)/../mkdb
|
||||
MKDB_LIBS = -L../mkdb -lmkdb
|
||||
@@ -97,8 +97,8 @@
|
||||
|
||||
install:
|
||||
if [ ! -d $(exec_prefix) ]; then mkdir $(exec_prefix); fi
|
||||
- if [ ! -d $(etcdir) ]; then mkdir $(etcdir); fi
|
||||
- $(INSTALL) rwhoisd $(etcdir)
|
||||
+ if [ ! -d $(sbindir) ]; then mkdir $(sbindir); fi
|
||||
+ $(INSTALL) rwhoisd $(sbindir)
|
||||
|
||||
uninstall:
|
||||
$(RM) $(etcdir)/rwhoisd
|
@ -1,35 +0,0 @@
|
||||
--- common/client_msgs.c.orig Tue Oct 28 02:24:02 2003
|
||||
+++ common/client_msgs.c Tue Oct 28 02:25:00 2003
|
||||
@@ -145,22 +145,16 @@
|
||||
printf ("%%ok\n");
|
||||
}
|
||||
|
||||
-void print_response(va_alist)
|
||||
- va_dcl
|
||||
+void print_response(int resp_no, char *format, ...)
|
||||
{
|
||||
va_list list;
|
||||
int i;
|
||||
- int resp_no;
|
||||
- char *format;
|
||||
FILE *fp;
|
||||
|
||||
- va_start(list);
|
||||
+ va_start(list, format);
|
||||
|
||||
fp = get_out_fp();
|
||||
|
||||
- resp_no = va_arg(list, int);
|
||||
- format = va_arg(list, char *);
|
||||
-
|
||||
for (i = 0; i < N_RESP; i++)
|
||||
{
|
||||
if (resp[i].resp_no == resp_no)
|
||||
@@ -179,6 +173,7 @@
|
||||
}
|
||||
|
||||
vfprintf(fp, format, list);
|
||||
+ va_end(list);
|
||||
|
||||
fprintf(fp, "\n");
|
||||
}
|
@ -1,11 +0,0 @@
|
||||
--- common/client_msgs.h.orig Tue Oct 28 02:25:14 2003
|
||||
+++ common/client_msgs.h Tue Oct 28 02:25:30 2003
|
||||
@@ -85,7 +85,7 @@
|
||||
|
||||
void print_error PROTO((int err_no, char *str));
|
||||
|
||||
-void print_response PROTO(());
|
||||
+void print_response PROTO((int resp_no, char *format, ...));
|
||||
|
||||
void print_ok PROTO((void));
|
||||
|
@ -1,11 +0,0 @@
|
||||
--- common/common.h.orig Tue Oct 28 02:23:23 2003
|
||||
+++ common/common.h Tue Oct 28 02:23:33 2003
|
||||
@@ -56,7 +56,7 @@
|
||||
# undef _VA_ALIGN
|
||||
# undef __va_stack_arg
|
||||
# endif
|
||||
-#include <varargs.h>
|
||||
+#include <stdarg.h>
|
||||
#endif /* HAVE_VPRINTF */
|
||||
|
||||
/* this should probably be #ifdef USG */
|
@ -1,38 +0,0 @@
|
||||
--- common/log.c.orig Tue Oct 28 02:26:55 2003
|
||||
+++ common/log.c Tue Oct 28 02:28:25 2003
|
||||
@@ -139,15 +139,12 @@
|
||||
/* log_error: prints a error message to the console. This is intended
|
||||
for server side errors only. */
|
||||
void
|
||||
-log_error(va_alist)
|
||||
- va_dcl
|
||||
+log_error(char *format, ...)
|
||||
{
|
||||
va_list list;
|
||||
- char *format;
|
||||
char err_buf[MAX_LINE];
|
||||
|
||||
- va_start(list);
|
||||
- format = va_arg(list, char *);
|
||||
+ va_start(list, format);
|
||||
|
||||
#ifdef HAVE_VSNPRINTF
|
||||
vsnprintf(err_buf, sizeof(err_buf), format, list);
|
||||
@@ -164,15 +161,12 @@
|
||||
/* log_warning: prints a warning message to the console. This is intended
|
||||
for server side warnings only. */
|
||||
void
|
||||
-log_warning(va_alist)
|
||||
- va_dcl
|
||||
+log_warning(char *format, ...)
|
||||
{
|
||||
va_list list;
|
||||
- char *format;
|
||||
char err_buf[MAX_LINE];
|
||||
|
||||
- va_start(list);
|
||||
- format = va_arg(list, char *);
|
||||
+ va_start(list, format);
|
||||
|
||||
#ifdef HAVE_VSNPRINTF
|
||||
vsnprintf(err_buf, sizeof(err_buf), format, list);
|
@ -1,23 +0,0 @@
|
||||
--- common/log.h.orig Tue Oct 28 02:25:55 2003
|
||||
+++ common/log.h Tue Oct 28 02:29:55 2003
|
||||
@@ -95,8 +95,8 @@
|
||||
/* old prototypes for backward compatibility */
|
||||
|
||||
#define l_strerror strerror
|
||||
-void log_error PROTO(());
|
||||
-void log_warning PROTO(());
|
||||
+void log_error PROTO((char *format, ...));
|
||||
+void log_warning PROTO((char *format, ...));
|
||||
char *get_client_hostname PROTO((int sock));
|
||||
char *timestamp PROTO(());
|
||||
|
||||
@@ -106,7 +106,8 @@
|
||||
(L_LOG_EMERG, L_LOG_ALERT, etc. [see internal_log_level in
|
||||
types.h) and SECTION is one of (NETWORK, QUERY, CONFIG, etc [see
|
||||
log_section in types.h) */
|
||||
-void log PROTO(());
|
||||
+#define log Log
|
||||
+void log PROTO((internal_log_levels level, int section, char *format, ...));
|
||||
|
||||
void setup_logging PROTO((void));
|
||||
|
@ -1,38 +0,0 @@
|
||||
--- common/rw_log.c.orig Tue Oct 28 02:28:43 2003
|
||||
+++ common/rw_log.c Tue Oct 28 02:30:14 2003
|
||||
@@ -17,13 +17,10 @@
|
||||
#include "types.h"
|
||||
|
||||
void
|
||||
-log(va_alist)
|
||||
- va_dcl
|
||||
+log(internal_log_levels level, int section, char *format, ...)
|
||||
{
|
||||
va_list ap;
|
||||
- internal_log_levels level;
|
||||
FILE *fp;
|
||||
- char *format;
|
||||
char *filename;
|
||||
char *hostname;
|
||||
char message[MAX_LINE];
|
||||
@@ -31,13 +28,9 @@
|
||||
char *section_name;
|
||||
int fd;
|
||||
int use_syslog;
|
||||
- int section;
|
||||
int syslog_level;
|
||||
|
||||
- va_start(ap);
|
||||
- level = (internal_log_levels) va_arg(ap, int);
|
||||
- section = (int) va_arg(ap, int);
|
||||
- format = va_arg(ap, char*);
|
||||
+ va_start(ap, format);
|
||||
|
||||
/* verbosity sets the level at which we ignore log messages */
|
||||
if (level > get_verbosity())
|
||||
@@ -142,4 +135,5 @@
|
||||
|
||||
fclose(fp);
|
||||
}
|
||||
+ va_end(ap);
|
||||
}
|
@ -1,6 +1,6 @@
|
||||
--- sample.data/rwhoisd.conf.orig Wed Nov 26 08:23:46 1997
|
||||
+++ sample.data/rwhoisd.conf Sat Nov 25 15:30:05 2000
|
||||
@@ -109,7 +109,7 @@
|
||||
--- sample.data/rwhoisd.conf.orig Thu Apr 14 15:28:24 2005
|
||||
+++ sample.data/rwhoisd.conf Thu Apr 14 15:28:32 2005
|
||||
@@ -109,7 +109,7 @@ security-deny: rwhoisd.deny
|
||||
# users group, as found in /etc/passwd.
|
||||
# note that this really, really should be an unprivileged user
|
||||
# this options doesn't have a default.
|
@ -1,31 +0,0 @@
|
||||
--- server/notify.c.orig Tue Oct 28 02:30:38 2003
|
||||
+++ server/notify.c Tue Oct 28 02:31:26 2003
|
||||
@@ -75,18 +75,13 @@
|
||||
|
||||
/* log notify information */
|
||||
int
|
||||
-log_entry(va_alist)
|
||||
- va_dcl
|
||||
+log_entry(char *filename, char *format, ...)
|
||||
{
|
||||
va_list ap;
|
||||
FILE *fp;
|
||||
- char *format;
|
||||
- char *filename;
|
||||
char *hostname;
|
||||
|
||||
- va_start(ap);
|
||||
- filename = va_arg (ap, char*);
|
||||
- format = va_arg(ap, char*);
|
||||
+ va_start(ap, format);
|
||||
|
||||
/* lock the file */
|
||||
fp = get_file_lock(filename, "a", 60);
|
||||
@@ -103,6 +98,7 @@
|
||||
fprintf(fp, " [%-15s] PID: %-8d", hostname, (int) getpid());
|
||||
vfprintf(fp, format, ap);
|
||||
fprintf(fp, "\n");
|
||||
+ va_end(ap);
|
||||
|
||||
release_file_lock(filename, fp);
|
||||
|
@ -17,6 +17,7 @@ lib/rwhois/a.com/schema
|
||||
lib/rwhois/a.com/soa
|
||||
lib/rwhois/bin/rwhois_deleter
|
||||
lib/rwhois/bin/rwhois_indexer
|
||||
lib/rwhois/bin/rwhois_repack
|
||||
lib/rwhois/net-10.0.0.0-8/attribute_defs/contact.tmpl
|
||||
lib/rwhois/net-10.0.0.0-8/attribute_defs/guardian.tmpl
|
||||
lib/rwhois/net-10.0.0.0-8/attribute_defs/host.tmpl
|
||||
@ -26,6 +27,15 @@ lib/rwhois/net-10.0.0.0-8/data/network/network.txt
|
||||
lib/rwhois/net-10.0.0.0-8/data/referral/referral.txt
|
||||
lib/rwhois/net-10.0.0.0-8/schema
|
||||
lib/rwhois/net-10.0.0.0-8/soa
|
||||
lib/rwhois/net-fd00:1234::-32/attribute_defs/host.tmpl
|
||||
lib/rwhois/net-fd00:1234::-32/attribute_defs/referral.tmpl
|
||||
lib/rwhois/net-fd00:1234::-32/attribute_defs/contact.tmpl
|
||||
lib/rwhois/net-fd00:1234::-32/attribute_defs/guardian.tmpl
|
||||
lib/rwhois/net-fd00:1234::-32/attribute_defs/network.tmpl
|
||||
lib/rwhois/net-fd00:1234::-32/data/referral/referral.txt
|
||||
lib/rwhois/net-fd00:1234::-32/data/network/network.txt
|
||||
lib/rwhois/net-fd00:1234::-32/soa
|
||||
lib/rwhois/net-fd00:1234::-32/schema
|
||||
lib/rwhois/rwhoisd.allow
|
||||
lib/rwhois/rwhoisd.auth_area
|
||||
lib/rwhois/rwhoisd.conf
|
||||
@ -49,6 +59,11 @@ lib/rwhois/sbin/rwhoisd
|
||||
@dirrm lib/rwhois/net-10.0.0.0-8/data
|
||||
@dirrm lib/rwhois/net-10.0.0.0-8/attribute_defs
|
||||
@dirrm lib/rwhois/net-10.0.0.0-8
|
||||
@dirrm lib/rwhois/net-fd00:1234::-32/attribute_defs
|
||||
@dirrm lib/rwhois/net-fd00:1234::-32/data/referral
|
||||
@dirrm lib/rwhois/net-fd00:1234::-32/data/network
|
||||
@dirrm lib/rwhois/net-fd00:1234::-32/data
|
||||
@dirrm lib/rwhois/net-fd00:1234::-32
|
||||
@dirrm lib/rwhois/bin
|
||||
@dirrm lib/rwhois/a.com/data/referral
|
||||
@dirrm lib/rwhois/a.com/data/org
|
||||
|
@ -6,10 +6,10 @@
|
||||
#
|
||||
|
||||
PORTNAME= rwhois
|
||||
PORTVERSION= 1.5.7.3
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 1.5.9.3
|
||||
CATEGORIES= net ipv6
|
||||
MASTER_SITES= http://www.rwhois.net/ftp/older_releases/
|
||||
MASTER_SITES= http://www.rwhois.net/ftp/ \
|
||||
http://www.rwhois.net/ftp/older_releases/
|
||||
DISTNAME= ${PORTNAME}d-${PORTVERSION}
|
||||
|
||||
MAINTAINER= ports@FreeBSD.org
|
||||
@ -17,6 +17,8 @@ COMMENT= The Internic referral whois server
|
||||
|
||||
HAS_CONFIGURE= yes
|
||||
CONFIGURE_ARGS= --prefix=${PREFIX}/lib/rwhois
|
||||
MAKE_ENV= RWHOIS_ROOT_DIR=${PREFIX}/lib/rwhois
|
||||
MAKE_ARGS= -E RWHOIS_ROOT_DIR
|
||||
|
||||
BINOWN= bin
|
||||
BINGRP= bin
|
||||
|
@ -1,2 +1,2 @@
|
||||
MD5 (rwhoisd-1.5.7.3.tar.gz) = b3a1d951454afec598a7531919ce22a0
|
||||
SIZE (rwhoisd-1.5.7.3.tar.gz) = 452141
|
||||
MD5 (rwhoisd-1.5.9.3.tar.gz) = f815090232d76c81ffbd384632e6b9d2
|
||||
SIZE (rwhoisd-1.5.9.3.tar.gz) = 525436
|
||||
|
@ -1,11 +0,0 @@
|
||||
--- Makefile.in.orig Tue Jun 3 23:20:53 1997
|
||||
+++ Makefile.in Sat Nov 25 15:44:00 2000
|
||||
@@ -25,7 +25,7 @@
|
||||
BIN_SUBDIRS = server tools
|
||||
ALL_SUBDIRS = $(LIB_SUBDIRS) $(BIN_SUBDIRS) $(SAMPLE_DATA_DIR)
|
||||
|
||||
-all: libraries libwrap binaries
|
||||
+all: libraries binaries
|
||||
|
||||
libraries:
|
||||
@for dir in $(LIB_SUBDIRS); do \
|
@ -1,33 +0,0 @@
|
||||
--- server/Makefile.in.orig Fri May 12 01:10:25 2000
|
||||
+++ server/Makefile.in Sat Nov 25 15:27:16 2000
|
||||
@@ -9,7 +9,7 @@
|
||||
prefix = @prefix@
|
||||
exec_prefix = @exec_prefix@
|
||||
bindir = $(exec_prefix)/bin
|
||||
-etcdir = $(exec_prefix)/etc
|
||||
+sbindir = $(exec_prefix)/sbin
|
||||
|
||||
srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
@@ -18,8 +18,8 @@
|
||||
COMMON_INC = -I$(srcdir)/../common
|
||||
COMMON_LIBS = -L../common -lrwcommon
|
||||
|
||||
-WRAP_INC = -I$(srcdir)../tools/tcpd_wrapper
|
||||
-WRAP_LIBS = -L../tools/tcpd_wrapper -lwrap
|
||||
+WRAP_INC = -I${LOCALBASE}/include
|
||||
+WRAP_LIBS = -L${LOCALBASE}/lib -lwrap
|
||||
|
||||
MKDB_INC = -I$(srcdir)/../mkdb
|
||||
MKDB_LIBS = -L../mkdb -lmkdb
|
||||
@@ -97,8 +97,8 @@
|
||||
|
||||
install:
|
||||
if [ ! -d $(exec_prefix) ]; then mkdir $(exec_prefix); fi
|
||||
- if [ ! -d $(etcdir) ]; then mkdir $(etcdir); fi
|
||||
- $(INSTALL) rwhoisd $(etcdir)
|
||||
+ if [ ! -d $(sbindir) ]; then mkdir $(sbindir); fi
|
||||
+ $(INSTALL) rwhoisd $(sbindir)
|
||||
|
||||
uninstall:
|
||||
$(RM) $(etcdir)/rwhoisd
|
@ -1,35 +0,0 @@
|
||||
--- common/client_msgs.c.orig Tue Oct 28 02:24:02 2003
|
||||
+++ common/client_msgs.c Tue Oct 28 02:25:00 2003
|
||||
@@ -145,22 +145,16 @@
|
||||
printf ("%%ok\n");
|
||||
}
|
||||
|
||||
-void print_response(va_alist)
|
||||
- va_dcl
|
||||
+void print_response(int resp_no, char *format, ...)
|
||||
{
|
||||
va_list list;
|
||||
int i;
|
||||
- int resp_no;
|
||||
- char *format;
|
||||
FILE *fp;
|
||||
|
||||
- va_start(list);
|
||||
+ va_start(list, format);
|
||||
|
||||
fp = get_out_fp();
|
||||
|
||||
- resp_no = va_arg(list, int);
|
||||
- format = va_arg(list, char *);
|
||||
-
|
||||
for (i = 0; i < N_RESP; i++)
|
||||
{
|
||||
if (resp[i].resp_no == resp_no)
|
||||
@@ -179,6 +173,7 @@
|
||||
}
|
||||
|
||||
vfprintf(fp, format, list);
|
||||
+ va_end(list);
|
||||
|
||||
fprintf(fp, "\n");
|
||||
}
|
@ -1,11 +0,0 @@
|
||||
--- common/client_msgs.h.orig Tue Oct 28 02:25:14 2003
|
||||
+++ common/client_msgs.h Tue Oct 28 02:25:30 2003
|
||||
@@ -85,7 +85,7 @@
|
||||
|
||||
void print_error PROTO((int err_no, char *str));
|
||||
|
||||
-void print_response PROTO(());
|
||||
+void print_response PROTO((int resp_no, char *format, ...));
|
||||
|
||||
void print_ok PROTO((void));
|
||||
|
@ -1,11 +0,0 @@
|
||||
--- common/common.h.orig Tue Oct 28 02:23:23 2003
|
||||
+++ common/common.h Tue Oct 28 02:23:33 2003
|
||||
@@ -56,7 +56,7 @@
|
||||
# undef _VA_ALIGN
|
||||
# undef __va_stack_arg
|
||||
# endif
|
||||
-#include <varargs.h>
|
||||
+#include <stdarg.h>
|
||||
#endif /* HAVE_VPRINTF */
|
||||
|
||||
/* this should probably be #ifdef USG */
|
@ -1,38 +0,0 @@
|
||||
--- common/log.c.orig Tue Oct 28 02:26:55 2003
|
||||
+++ common/log.c Tue Oct 28 02:28:25 2003
|
||||
@@ -139,15 +139,12 @@
|
||||
/* log_error: prints a error message to the console. This is intended
|
||||
for server side errors only. */
|
||||
void
|
||||
-log_error(va_alist)
|
||||
- va_dcl
|
||||
+log_error(char *format, ...)
|
||||
{
|
||||
va_list list;
|
||||
- char *format;
|
||||
char err_buf[MAX_LINE];
|
||||
|
||||
- va_start(list);
|
||||
- format = va_arg(list, char *);
|
||||
+ va_start(list, format);
|
||||
|
||||
#ifdef HAVE_VSNPRINTF
|
||||
vsnprintf(err_buf, sizeof(err_buf), format, list);
|
||||
@@ -164,15 +161,12 @@
|
||||
/* log_warning: prints a warning message to the console. This is intended
|
||||
for server side warnings only. */
|
||||
void
|
||||
-log_warning(va_alist)
|
||||
- va_dcl
|
||||
+log_warning(char *format, ...)
|
||||
{
|
||||
va_list list;
|
||||
- char *format;
|
||||
char err_buf[MAX_LINE];
|
||||
|
||||
- va_start(list);
|
||||
- format = va_arg(list, char *);
|
||||
+ va_start(list, format);
|
||||
|
||||
#ifdef HAVE_VSNPRINTF
|
||||
vsnprintf(err_buf, sizeof(err_buf), format, list);
|
@ -1,23 +0,0 @@
|
||||
--- common/log.h.orig Tue Oct 28 02:25:55 2003
|
||||
+++ common/log.h Tue Oct 28 02:29:55 2003
|
||||
@@ -95,8 +95,8 @@
|
||||
/* old prototypes for backward compatibility */
|
||||
|
||||
#define l_strerror strerror
|
||||
-void log_error PROTO(());
|
||||
-void log_warning PROTO(());
|
||||
+void log_error PROTO((char *format, ...));
|
||||
+void log_warning PROTO((char *format, ...));
|
||||
char *get_client_hostname PROTO((int sock));
|
||||
char *timestamp PROTO(());
|
||||
|
||||
@@ -106,7 +106,8 @@
|
||||
(L_LOG_EMERG, L_LOG_ALERT, etc. [see internal_log_level in
|
||||
types.h) and SECTION is one of (NETWORK, QUERY, CONFIG, etc [see
|
||||
log_section in types.h) */
|
||||
-void log PROTO(());
|
||||
+#define log Log
|
||||
+void log PROTO((internal_log_levels level, int section, char *format, ...));
|
||||
|
||||
void setup_logging PROTO((void));
|
||||
|
@ -1,38 +0,0 @@
|
||||
--- common/rw_log.c.orig Tue Oct 28 02:28:43 2003
|
||||
+++ common/rw_log.c Tue Oct 28 02:30:14 2003
|
||||
@@ -17,13 +17,10 @@
|
||||
#include "types.h"
|
||||
|
||||
void
|
||||
-log(va_alist)
|
||||
- va_dcl
|
||||
+log(internal_log_levels level, int section, char *format, ...)
|
||||
{
|
||||
va_list ap;
|
||||
- internal_log_levels level;
|
||||
FILE *fp;
|
||||
- char *format;
|
||||
char *filename;
|
||||
char *hostname;
|
||||
char message[MAX_LINE];
|
||||
@@ -31,13 +28,9 @@
|
||||
char *section_name;
|
||||
int fd;
|
||||
int use_syslog;
|
||||
- int section;
|
||||
int syslog_level;
|
||||
|
||||
- va_start(ap);
|
||||
- level = (internal_log_levels) va_arg(ap, int);
|
||||
- section = (int) va_arg(ap, int);
|
||||
- format = va_arg(ap, char*);
|
||||
+ va_start(ap, format);
|
||||
|
||||
/* verbosity sets the level at which we ignore log messages */
|
||||
if (level > get_verbosity())
|
||||
@@ -142,4 +135,5 @@
|
||||
|
||||
fclose(fp);
|
||||
}
|
||||
+ va_end(ap);
|
||||
}
|
@ -1,6 +1,6 @@
|
||||
--- sample.data/rwhoisd.conf.orig Wed Nov 26 08:23:46 1997
|
||||
+++ sample.data/rwhoisd.conf Sat Nov 25 15:30:05 2000
|
||||
@@ -109,7 +109,7 @@
|
||||
--- sample.data/rwhoisd.conf.orig Thu Apr 14 15:28:24 2005
|
||||
+++ sample.data/rwhoisd.conf Thu Apr 14 15:28:32 2005
|
||||
@@ -109,7 +109,7 @@ security-deny: rwhoisd.deny
|
||||
# users group, as found in /etc/passwd.
|
||||
# note that this really, really should be an unprivileged user
|
||||
# this options doesn't have a default.
|
@ -1,31 +0,0 @@
|
||||
--- server/notify.c.orig Tue Oct 28 02:30:38 2003
|
||||
+++ server/notify.c Tue Oct 28 02:31:26 2003
|
||||
@@ -75,18 +75,13 @@
|
||||
|
||||
/* log notify information */
|
||||
int
|
||||
-log_entry(va_alist)
|
||||
- va_dcl
|
||||
+log_entry(char *filename, char *format, ...)
|
||||
{
|
||||
va_list ap;
|
||||
FILE *fp;
|
||||
- char *format;
|
||||
- char *filename;
|
||||
char *hostname;
|
||||
|
||||
- va_start(ap);
|
||||
- filename = va_arg (ap, char*);
|
||||
- format = va_arg(ap, char*);
|
||||
+ va_start(ap, format);
|
||||
|
||||
/* lock the file */
|
||||
fp = get_file_lock(filename, "a", 60);
|
||||
@@ -103,6 +98,7 @@
|
||||
fprintf(fp, " [%-15s] PID: %-8d", hostname, (int) getpid());
|
||||
vfprintf(fp, format, ap);
|
||||
fprintf(fp, "\n");
|
||||
+ va_end(ap);
|
||||
|
||||
release_file_lock(filename, fp);
|
||||
|
@ -17,6 +17,7 @@ lib/rwhois/a.com/schema
|
||||
lib/rwhois/a.com/soa
|
||||
lib/rwhois/bin/rwhois_deleter
|
||||
lib/rwhois/bin/rwhois_indexer
|
||||
lib/rwhois/bin/rwhois_repack
|
||||
lib/rwhois/net-10.0.0.0-8/attribute_defs/contact.tmpl
|
||||
lib/rwhois/net-10.0.0.0-8/attribute_defs/guardian.tmpl
|
||||
lib/rwhois/net-10.0.0.0-8/attribute_defs/host.tmpl
|
||||
@ -26,6 +27,15 @@ lib/rwhois/net-10.0.0.0-8/data/network/network.txt
|
||||
lib/rwhois/net-10.0.0.0-8/data/referral/referral.txt
|
||||
lib/rwhois/net-10.0.0.0-8/schema
|
||||
lib/rwhois/net-10.0.0.0-8/soa
|
||||
lib/rwhois/net-fd00:1234::-32/attribute_defs/host.tmpl
|
||||
lib/rwhois/net-fd00:1234::-32/attribute_defs/referral.tmpl
|
||||
lib/rwhois/net-fd00:1234::-32/attribute_defs/contact.tmpl
|
||||
lib/rwhois/net-fd00:1234::-32/attribute_defs/guardian.tmpl
|
||||
lib/rwhois/net-fd00:1234::-32/attribute_defs/network.tmpl
|
||||
lib/rwhois/net-fd00:1234::-32/data/referral/referral.txt
|
||||
lib/rwhois/net-fd00:1234::-32/data/network/network.txt
|
||||
lib/rwhois/net-fd00:1234::-32/soa
|
||||
lib/rwhois/net-fd00:1234::-32/schema
|
||||
lib/rwhois/rwhoisd.allow
|
||||
lib/rwhois/rwhoisd.auth_area
|
||||
lib/rwhois/rwhoisd.conf
|
||||
@ -49,6 +59,11 @@ lib/rwhois/sbin/rwhoisd
|
||||
@dirrm lib/rwhois/net-10.0.0.0-8/data
|
||||
@dirrm lib/rwhois/net-10.0.0.0-8/attribute_defs
|
||||
@dirrm lib/rwhois/net-10.0.0.0-8
|
||||
@dirrm lib/rwhois/net-fd00:1234::-32/attribute_defs
|
||||
@dirrm lib/rwhois/net-fd00:1234::-32/data/referral
|
||||
@dirrm lib/rwhois/net-fd00:1234::-32/data/network
|
||||
@dirrm lib/rwhois/net-fd00:1234::-32/data
|
||||
@dirrm lib/rwhois/net-fd00:1234::-32
|
||||
@dirrm lib/rwhois/bin
|
||||
@dirrm lib/rwhois/a.com/data/referral
|
||||
@dirrm lib/rwhois/a.com/data/org
|
||||
|
Loading…
Reference in New Issue
Block a user