aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ps.c8
-rw-r--r--ssl.c3
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,