diff options
| author | Greg Hudson <ghudson@mit.edu> | 2013-11-25 11:46:47 -0500 |
|---|---|---|
| committer | Greg Hudson <ghudson@mit.edu> | 2013-11-25 17:03:09 -0500 |
| commit | 5384f45e728957da20ecf82d8cf567945a2bbf6e (patch) | |
| tree | 263f24b16799eb1391b95879317fd21ef4e2e1f3 /src/kadmin/server/misc.h | |
| parent | 4c57a429760a3b3aa89938a13708742675f9548b (diff) | |
| download | krb5-5384f45e728957da20ecf82d8cf567945a2bbf6e.tar.gz krb5-5384f45e728957da20ecf82d8cf567945a2bbf6e.tar.xz krb5-5384f45e728957da20ecf82d8cf567945a2bbf6e.zip | |
Correctly log IPv6 addresses in kadmind
Define client_addr() in server_stubs.c and use it consistently in that
file and ipropd_svc.c to get the client address from a transport
handle. In it, call getpeername() on the client socket and use
inet_ntop() on the result, instead of using inet_ntoa() on the IPv4
socket address. Provide a log_badauth2 callback to GSSRPC, so that we
get a transport handle instead of an IPv4 socket address, and use
client_addr() within it instead of inet_ntoa().
ticket: 7770
target_version: 1.12
tags: pullup
Diffstat (limited to 'src/kadmin/server/misc.h')
| -rw-r--r-- | src/kadmin/server/misc.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/kadmin/server/misc.h b/src/kadmin/server/misc.h index 3d2eda104..ea0fc7d22 100644 --- a/src/kadmin/server/misc.h +++ b/src/kadmin/server/misc.h @@ -9,10 +9,6 @@ #include "net-server.h" /* for krb5_fulladdr */ -void -log_badauth(OM_uint32 major, OM_uint32 minor, - struct sockaddr_in *addr, char *data); - int setup_gss_names(struct svc_req *, gss_buffer_desc *, gss_buffer_desc *); @@ -55,8 +51,9 @@ gss_to_krb5_name_1(struct svc_req *rqstp, krb5_context ctx, gss_name_t gss_name, void reset_db(void); -void log_badauth(OM_uint32 major, OM_uint32 minor, - struct sockaddr_in *addr, char *data); +void log_badauth(OM_uint32 major, OM_uint32 minor, SVCXPRT *xprt, char *data); + +const char *client_addr(SVCXPRT *xprt); /* network.c */ #include "net-server.h" |