From 0b6450c93f9efb51ac089dbe0a43b139bc0b89bd Mon Sep 17 00:00:00 2001 From: David Sommerseth Date: Tue, 26 Apr 2011 23:27:12 +0200 Subject: Solved hidden merge conflicts between master and svn-branch-2.1 ps.c - The feat_ipv6_transport patch set modifies struct openvpn_sockaddr by adding a union named 'addr' in commit 8335caf929f21b31. ssl.c - A needed } and #endif had been dropped by a mistake Signed-off-by: David Sommerseth --- ps.c | 8 ++++---- ssl.c | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ps.c b/ps.c index d5be31e..1474a4b 100644 --- a/ps.c +++ b/ps.c @@ -319,10 +319,10 @@ journal_add (const char *journal_dir, struct proxy_connection *pc, struct proxy_ char *jfn; int fd; - slen = sizeof(from.sa); - dlen = sizeof(to.sa); - if (!getpeername (pc->sd, (struct sockaddr *) &from.sa, &slen) - && !getsockname (cp->sd, (struct sockaddr *) &to.sa, &dlen)) + slen = sizeof(from.addr.sa); + dlen = sizeof(to.addr.sa); + if (!getpeername (pc->sd, (struct sockaddr *) &from.addr.sa, &slen) + && !getsockname (cp->sd, (struct sockaddr *) &to.addr.sa, &dlen)) { const char *f = print_sockaddr_ex (&from, ":", PS_SHOW_PORT, &gc); const char *t = print_sockaddr_ex (&to, ":", PS_SHOW_PORT, &gc); diff --git a/ssl.c b/ssl.c index a2b5b18..a0493ff 100644 --- a/ssl.c +++ b/ssl.c @@ -585,6 +585,9 @@ bool extract_x509_extension(X509 *cert, char *fieldname, char *out, int size) sk_GENERAL_NAME_free (extensions); } return retval; +} +#endif /* ENABLE_X509ALTUSERNAME */ + #ifdef ENABLE_X509_TRACK /* * setenv_x509_track function -- save X509 fields to environment, -- cgit v1.2.3