Accepting request 24994 from home:elvigia:branches:Base:System
Copy from home:elvigia:branches:Base:System/syslogd via accept of submit request 24994 revision 2. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/24994 OBS-URL: https://build.opensuse.org/package/show/Base:System/syslogd?expand=0&rev=10
This commit is contained in:
@@ -1,6 +1,8 @@
|
||||
--- sysklogd-1.4.1/Makefile.resolve 2003-06-02 14:30:18.000000000 +0200
|
||||
+++ sysklogd-1.4.1/Makefile 2003-06-02 14:30:18.000000000 +0200
|
||||
@@ -62,8 +62,8 @@
|
||||
Index: Makefile
|
||||
===================================================================
|
||||
--- Makefile.orig 2009-11-24 18:12:53.675378000 +0100
|
||||
+++ Makefile 2009-11-24 18:12:53.916293000 +0100
|
||||
@@ -59,8 +59,8 @@ test: syslog_tst ksym oops_test tsyslogd
|
||||
|
||||
install: install_man install_exec
|
||||
|
||||
@@ -11,8 +13,10 @@
|
||||
|
||||
klogd: klogd.o syslog.o pidfile.o ksym.o ksym_mod.o
|
||||
${CC} ${LDFLAGS} -o klogd klogd.o syslog.o pidfile.o ksym.o \
|
||||
--- sysklogd-1.4.1/resolve.c.resolve 2003-06-02 14:30:18.000000000 +0200
|
||||
+++ sysklogd-1.4.1/resolve.c 2003-06-02 14:30:33.000000000 +0200
|
||||
Index: resolve.c
|
||||
===================================================================
|
||||
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
|
||||
+++ resolve.c 2009-11-24 18:12:53.920294000 +0100
|
||||
@@ -0,0 +1,249 @@
|
||||
+/*
|
||||
+ * Resolve a hostname
|
||||
@@ -263,9 +267,11 @@
|
||||
+ write(fd, &ss, sizeof(ss));
|
||||
+ exit(0);
|
||||
+}
|
||||
--- sysklogd-1.4.1/syslogd.c.resolve 2003-06-02 14:30:18.000000000 +0200
|
||||
+++ sysklogd-1.4.1/syslogd.c 2003-06-02 14:30:26.000000000 +0200
|
||||
@@ -633,14 +633,7 @@
|
||||
Index: syslogd.c
|
||||
===================================================================
|
||||
--- syslogd.c.orig 2009-11-24 18:12:53.679395000 +0100
|
||||
+++ syslogd.c 2009-11-24 18:12:53.926309000 +0100
|
||||
@@ -628,14 +628,7 @@ struct filed {
|
||||
struct {
|
||||
char f_hname[MAXHOSTNAMELEN+1];
|
||||
#ifdef INET6
|
||||
@@ -281,7 +287,7 @@
|
||||
#else
|
||||
struct sockaddr_in f_addr;
|
||||
#endif
|
||||
@@ -795,7 +788,7 @@
|
||||
@@ -790,7 +783,7 @@ int decode(char *name, struct code *code
|
||||
#if defined(__GLIBC__)
|
||||
#define dprintf mydprintf
|
||||
#endif /* __GLIBC__ */
|
||||
@@ -290,7 +296,7 @@
|
||||
static void allocate_log(void);
|
||||
void sighup_handler();
|
||||
|
||||
@@ -804,10 +797,8 @@
|
||||
@@ -799,10 +792,8 @@ static int create_unix_socket(const char
|
||||
#endif
|
||||
#ifdef SYSLOG_INET
|
||||
static int create_inet_socket();
|
||||
@@ -303,7 +309,7 @@
|
||||
#endif
|
||||
|
||||
int main(argc, argv)
|
||||
@@ -1342,63 +1333,6 @@
|
||||
@@ -1337,63 +1328,6 @@ static int create_inet_socket()
|
||||
return fd;
|
||||
}
|
||||
|
||||
@@ -367,7 +373,7 @@
|
||||
#endif
|
||||
|
||||
char **
|
||||
@@ -1821,7 +1755,7 @@
|
||||
@@ -1814,7 +1748,7 @@ void fprintlog(f, from, flags, msg)
|
||||
char line[MAXLINE + 1];
|
||||
time_t fwd_suspend;
|
||||
#ifdef INET6
|
||||
@@ -376,7 +382,7 @@
|
||||
#else
|
||||
struct hostent *hp;
|
||||
#endif
|
||||
@@ -1890,38 +1824,21 @@
|
||||
@@ -1883,38 +1817,21 @@ void fprintlog(f, from, flags, msg)
|
||||
*/
|
||||
case F_FORW_UNKN:
|
||||
dprintf(" %s\n", f->f_un.f_forw.f_hname);
|
||||
@@ -429,7 +435,7 @@
|
||||
|
||||
case F_FORW:
|
||||
/*
|
||||
@@ -2553,6 +2470,7 @@
|
||||
@@ -2544,6 +2461,7 @@ void init()
|
||||
#endif
|
||||
|
||||
#ifdef SYSLOG_INET
|
||||
@@ -437,7 +443,7 @@
|
||||
if (Forwarding || AcceptRemote) {
|
||||
if (finet < 0) {
|
||||
finet = create_inet_socket();
|
||||
@@ -2569,10 +2487,6 @@
|
||||
@@ -2560,10 +2478,6 @@ void init()
|
||||
InetInuse = 0;
|
||||
}
|
||||
inetm = finet;
|
||||
@@ -448,7 +454,7 @@
|
||||
#endif
|
||||
|
||||
Initialized = 1;
|
||||
@@ -2932,7 +2846,7 @@
|
||||
@@ -2923,7 +2837,7 @@ int decode(name, codetab)
|
||||
return (-1);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user