upstream/openvpn
1
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2026-06-11 01:40:05 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Solved hidden merge conflicts between master and svn-branch-2.1

Browse source 
ps.c - The feat_ipv6_transport patch set modifies struct openvpn_sockaddr by
       adding a union named 'addr' in commit 8335caf929.

ssl.c - A needed } and #endif had been dropped by a mistake

Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>
This commit is contained in:
David Sommerseth 2011-04-26 23:27:12 +02:00
parent 20b18fd799
commit 0b6450c93f
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ps.c
View file

@ -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);

3
ssl.c
View file

@ -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,