diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2002-07-05 19:56:15 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2002-07-05 19:56:15 +0000 |
| commit | fc50ce3d9d7221d156aa0e4e8fc2ffad2e52599f (patch) | |
| tree | 1e573a902fb8b2e3a3f758cd946e2af6ca3be31e /src/kdc/do_tgs_req.c | |
| parent | c549539adaf8cb98b32a2f178a351906cdb20653 (diff) | |
| download | krb5-fc50ce3d9d7221d156aa0e4e8fc2ffad2e52599f.tar.gz krb5-fc50ce3d9d7221d156aa0e4e8fc2ffad2e52599f.tar.xz krb5-fc50ce3d9d7221d156aa0e4e8fc2ffad2e52599f.zip | |
Reduce or localize dependencies on address families.
* kdc_util.h (ADDRTYPE2FAMILY): New macro.
* do_as_req.c (process_as_req): Use inet_ntop instead of inet_ntoa.
* do_tgs_req.c (process_tgs_req): Ditto.
* dispatch.c (dispatch): Fix inet_ntop code, and use it always.
* kerberos_v4.c (process_v4): Check address family before copying out an IPv4
address. Log if not IPv4, but continue.
* network.c (set_sa_port): New function.
(setup_port): Use it. Combine IPv4 and IPv6 paths; IPv6 still disabled for
now. Modify supplied sockaddr instead of making a copy.
(process_packet): SADDR is now sockaddr_storage. Use socket-utils macros
instead of casting. Enable the IPv6 code.
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14602 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kdc/do_tgs_req.c')
| -rw-r--r-- | src/kdc/do_tgs_req.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/kdc/do_tgs_req.c b/src/kdc/do_tgs_req.c index ed33226dc..5b1d20b4d 100644 --- a/src/kdc/do_tgs_req.c +++ b/src/kdc/do_tgs_req.c @@ -76,7 +76,8 @@ process_tgs_req(pkt, from, response) krb5_timestamp until, rtime; krb5_keyblock encrypting_key; krb5_key_data *server_key; - char *cname = 0, *sname = 0, *tmp = 0, *fromstring = 0; + char *cname = 0, *sname = 0, *tmp = 0; + const char *fromstring = 0; krb5_last_req_entry *nolrarray[2], nolrentry; /* krb5_address *noaddrarray[1]; */ krb5_enctype useenctype; @@ -86,6 +87,7 @@ process_tgs_req(pkt, from, response) const char *status = 0; char ktypestr[128]; char rep_etypestr[128]; + char fromstringbuf[70]; session_key.contents = 0; @@ -101,11 +103,9 @@ process_tgs_req(pkt, from, response) if ((retval = setup_server_realm(request->server))) return retval; -#ifdef HAVE_NETINET_IN_H - if (from->address->addrtype == ADDRTYPE_INET) - fromstring = - (char *) inet_ntoa(*(struct in_addr *)from->address->contents); -#endif + fromstring = inet_ntop(ADDRTYPE2FAMILY(from->address->addrtype), + from->address->contents, + fromstringbuf, sizeof(fromstringbuf)); if (!fromstring) fromstring = "<unknown>"; |