Subversion Repositories prayer

Compare Revisions

Ignore whitespace Rev 139 → Rev 142

/trunk/debian/patches/sighandling.patch
1,7 → 1,5
Index: prayer-1.0.18/prayer/os.h
===================================================================
--- prayer-1.0.18.orig/prayer/os.h 2007-03-10 19:56:40.357114747 +0100
+++ prayer-1.0.18/prayer/os.h 2007-03-10 19:57:56.266959171 +0100
--- a/lib/os.h
+++ b/lib/os.h
@@ -44,6 +44,8 @@ BOOL os_signal_alarm_clear(void);
BOOL os_signal_init();
11,11 → 9,9
BOOL os_lock_exclusive(int fd);
BOOL os_lock_shared(int fd);
Index: prayer-1.0.18/prayer/session_server.c
===================================================================
--- prayer-1.0.18.orig/prayer/session_server.c 2007-03-10 19:56:40.647152355 +0100
+++ prayer-1.0.18/prayer/session_server.c 2007-03-10 19:57:56.326966954 +0100
@@ -355,6 +355,7 @@ BOOL session_server(struct config *confi
--- a/servers/session_server.c
+++ b/servers/session_server.c
@@ -286,6 +286,7 @@ BOOL session_server(struct config *confi
fd_set readfds;
pid_t child;
unsigned long timeout = 0L;
23,7 → 19,7
if (config->direct_enable) {
ssl_portlist
@@ -420,6 +421,18 @@ BOOL session_server(struct config *confi
@@ -348,6 +349,18 @@ BOOL session_server(struct config *confi
} else {
rc = select(maxfd + 1, &readfds, NIL, NIL, NIL);
}
42,10 → 38,8
}
while ((rc < 0) && (errno == EINTR));
Index: prayer-1.0.18/prayer/log.c
===================================================================
--- prayer-1.0.18.orig/prayer/log.c 2007-03-10 19:58:03.667919109 +0100
+++ prayer-1.0.18/prayer/log.c 2007-03-10 19:58:11.688959503 +0100
--- a/shared/log.c
+++ b/shared/log.c
@@ -502,6 +502,13 @@ BOOL log_misc_init(struct config *config
return (log_open(log_misc_ptr, log_name));
}
60,10 → 54,8
/* log_misc_ping() *******************************************************
*
* Reopen misc log file if required
Index: prayer-1.0.18/prayer/log.h
===================================================================
--- prayer-1.0.18.orig/prayer/log.h 2007-03-10 19:58:04.067970999 +0100
+++ prayer-1.0.18/prayer/log.h 2007-03-10 19:58:11.648954314 +0100
--- a/shared/log.h
+++ b/shared/log.h
@@ -45,6 +45,8 @@ void log_record_peer_pid(struct log *log
BOOL
log_misc_init(struct config *config, char *progname, char *misc_log_name);