diff options
author | David Sommerseth <dazo@users.sourceforge.net> | 2011-04-26 23:27:12 +0200 |
---|---|---|
committer | David Sommerseth <dazo@users.sourceforge.net> | 2011-04-26 23:27:12 +0200 |
commit | 0b6450c93f9efb51ac089dbe0a43b139bc0b89bd (patch) | |
tree | 67a4f011b64273e1cba774041654f6ffa84855df | |
parent | Merge branch 'svn-branch-2.1' into merge (diff) | |
download | openvpn-0b6450c93f9efb51ac089dbe0a43b139bc0b89bd.tar.xz |
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 <dazo@users.sourceforge.net>
-rw-r--r-- | ps.c | 8 | ||||
-rw-r--r-- | ssl.c | 3 |
2 files changed, 7 insertions, 4 deletions
@@ -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); @@ -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, |