Attachment 159445 Details for Bug 248567 – Upstream patch to resolve the problem

[patch] Upstream patch to resolve the problem

ipsec-tools-plog.patch (text/plain), 1.67 KB, created by Steve Conklin on 2007-07-17 15:13:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Conklin

Created: 2007-07-17 15:13:03 UTC

Size: 1.67 KB

patch

obsolete

>diff --git a/src/racoon/crypto_openssl.c b/src/racoon/crypto_openssl.c
>index fbb0320..491d299 100644
>--- a/src/racoon/crypto_openssl.c
>+++ b/src/racoon/crypto_openssl.c
>@@ -89,6 +89,7 @@
> #include "crypto/sha2/sha2.h"
> #endif
> #endif
>+#include "plog.h"
> 
> /* 0.9.7 stuff? */
> #if OPENSSL_VERSION_NUMBER < 0x0090700fL
>diff --git a/src/racoon/kmpstat.c b/src/racoon/kmpstat.c
>index 37c16c9..01200b6 100644
>--- a/src/racoon/kmpstat.c
>+++ b/src/racoon/kmpstat.c
>@@ -186,7 +186,7 @@ bad1:
>  * Dumb plog functions (used by sockmisc.c) 
>  */
> void
>-plog(int pri, const char *func, struct sockaddr *sa, const char *fmt, ...)
>+_plog(int pri, const char *func, struct sockaddr *sa, const char *fmt, ...)
> {
> 	va_list ap;
> 
>diff --git a/src/racoon/plog.c b/src/racoon/plog.c
>index c70a5a0..c9a8450 100644
>--- a/src/racoon/plog.c
>+++ b/src/racoon/plog.c
>@@ -138,7 +138,7 @@ plog_common(pri, fmt, func)
> }
> 
> void
>-plog(int pri, const char *func, struct sockaddr *sa, const char *fmt, ...)
>+_plog(int pri, const char *func, struct sockaddr *sa, const char *fmt, ...)
> {
> 	va_list ap;
> 
>diff --git a/src/racoon/plog.h b/src/racoon/plog.h
>index 1fafd7c..3ddd1e0 100644
>--- a/src/racoon/plog.h
>+++ b/src/racoon/plog.h
>@@ -64,7 +64,12 @@ extern int f_foreground;
> extern int print_location;
> 
> struct sockaddr;
>-extern void plog __P((int, const char *, struct sockaddr *, const char *, ...))
>+#define plog(pri, ...) \
>+	do { \
>+		if ((pri) <= loglevel) \
>+			_plog((pri), __VA_ARGS__); \
>+	} while (0)
>+extern void _plog __P((int, const char *, struct sockaddr *, const char *, ...))
> 	__attribute__ ((__format__ (__printf__, 4, 5)));
> extern void plogv __P((int, const char *, struct sockaddr *,
> 	const char *, va_list));

Actions: View | Diff

Attachments on bug 248567: 159445