|
|
|
|
@ -1,7 +1,7 @@
|
|
|
|
|
Index: configure
|
|
|
|
|
--- configure.orig 2010-01-21 14:26:59 +0100
|
|
|
|
|
+++ configure 2010-02-13 09:50:45 +0100
|
|
|
|
|
@@ -23911,6 +23911,7 @@
|
|
|
|
|
--- configure.orig 2010-03-26 21:56:26.000000000 +0100
|
|
|
|
|
+++ configure 2010-04-06 08:06:12.000000000 +0200
|
|
|
|
|
@@ -23927,6 +23927,7 @@
|
|
|
|
|
cat confdefs.h >>conftest.$ac_ext
|
|
|
|
|
cat >>conftest.$ac_ext <<_ACEOF
|
|
|
|
|
/* end confdefs.h. */
|
|
|
|
|
@ -10,21 +10,21 @@ Index: configure
|
|
|
|
|
#include <sys/types.h>
|
|
|
|
|
#include <sys/socket.h>
|
|
|
|
|
Index: src/options.c
|
|
|
|
|
--- src/options.c.orig 2010-01-29 11:43:23 +0100
|
|
|
|
|
+++ src/options.c 2010-02-13 09:52:04 +0100
|
|
|
|
|
@@ -1591,7 +1591,7 @@
|
|
|
|
|
#else
|
|
|
|
|
if((unsigned int)section->option.accept +
|
|
|
|
|
(unsigned int)section->option.program +
|
|
|
|
|
- (unsigned int)section->option.remote != 2)
|
|
|
|
|
+ (unsigned int)section->option.remote != (section->option.client ? 1 : 2))
|
|
|
|
|
#endif
|
|
|
|
|
{
|
|
|
|
|
config_error(line_number,
|
|
|
|
|
--- src/options.c.orig 2010-04-05 20:44:43.000000000 +0200
|
|
|
|
|
+++ src/options.c 2010-04-06 08:08:03.000000000 +0200
|
|
|
|
|
@@ -1611,7 +1611,7 @@
|
|
|
|
|
} else { /* standalone mode checks */
|
|
|
|
|
if((unsigned int)section->option.accept +
|
|
|
|
|
(unsigned int)section->option.program +
|
|
|
|
|
- (unsigned int)section->option.remote != 2) {
|
|
|
|
|
+ (unsigned int)section->option.remote != (section->option.client ? 1 : 2)) {
|
|
|
|
|
config_error(line_number,
|
|
|
|
|
"Each service section must define two endpoints");
|
|
|
|
|
return 0;
|
|
|
|
|
Index: tools/Makefile.in
|
|
|
|
|
--- tools/Makefile.in.orig 2010-01-21 14:26:58 +0100
|
|
|
|
|
+++ tools/Makefile.in 2010-02-13 09:50:45 +0100
|
|
|
|
|
@@ -397,7 +397,7 @@
|
|
|
|
|
--- tools/Makefile.in.orig 2010-03-31 11:45:09.000000000 +0200
|
|
|
|
|
+++ tools/Makefile.in 2010-04-06 08:06:12.000000000 +0200
|
|
|
|
|
@@ -403,7 +403,7 @@
|
|
|
|
|
${INSTALL} -m 600 stunnel.pem $(DESTDIR)$(confdir)/stunnel.pem; \
|
|
|
|
|
rm stunnel.pem; \
|
|
|
|
|
fi
|
|
|
|
|
|
