* network.c (process_packet): Call inet_ntop directly.

* sock2p.c: Deleted.
* Makefile.in (SRCS, OBJS): Drop it.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@14834 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog
index dfd79793f17db32be7fd7a652a8dad3664211333..b3a6a1a6647866fac9f20001688e767432be7a67 100644 (file)
--- a/src/kdc/ChangeLog
+++ b/src/kdc/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-10  Ken Raeburn  <raeburn@mit.edu>
+
+       * network.c (process_packet): Call inet_ntop directly.
+       * sock2p.c: Deleted.
+       * Makefile.in (SRCS, OBJS): Drop it.
+
 2002-08-23  Ken Raeburn  <raeburn@mit.edu>
 
        * Makefile.in: Change $(S)=>/ and $(U)=>.. globally.

diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in
index 15841819b5e8bc99c46e08aa327927e9591bf88b..a39c970c45dda02ab0cd5db5f9730d476c8977ea 100644 (file)
--- a/src/kdc/Makefile.in
+++ b/src/kdc/Makefile.in
@@ -27,7 +27,6 @@ SRCS= \
        $(SRCTOP)/lib/kadm5/logger.c \
        $(srcdir)/main.c \
        $(srcdir)/network.c \
-       $(srcdir)/sock2p.c \
        $(srcdir)/policy.c \
        $(srcdir)/extern.c \
        $(srcdir)/replay.c \
@@ -43,7 +42,6 @@ OBJS= \
        logger.o \
        main.o \
        network.o \
-       sock2p.o \
        policy.o \
        extern.o \
        replay.o \
@@ -145,11 +143,6 @@ $(OUTPRE)network.$(OBJEXT): network.c $(SRCTOP)/include/k5-int.h \
   $(BUILDTOP)/include/profile.h kdc_util.h extern.h kdc5_err.h \
   $(SRCTOP)/include/krb5/adm_proto.h $(SRCTOP)/include/syslog.h \
   $(SRCTOP)/include/fake-addrinfo.h $(SRCTOP)/include/foreachaddr.c
-$(OUTPRE)sock2p.$(OBJEXT): sock2p.c $(SRCTOP)/include/k5-int.h \
-  $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \
-  $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(SRCTOP)/include/port-sockets.h \
-  $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/krb5/kdb.h \
-  $(BUILDTOP)/include/profile.h kdc_util.h
 $(OUTPRE)policy.$(OBJEXT): policy.c $(SRCTOP)/include/k5-int.h \
   $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \
   $(BUILDTOP)/include/krb5.h $(COM_ERR_DEPS) $(SRCTOP)/include/port-sockets.h \

diff --git a/src/kdc/network.c b/src/kdc/network.c
index 7eeb282327b3c17455d646251cf9acf9c8e13bf0..8442b219600deeba04df3038c90669393a6299cd 100644 (file)
--- a/src/kdc/network.c
+++ b/src/kdc/network.c
@@ -311,6 +311,7 @@ static void process_packet(port_fd, prog)
        addr.addrtype = -1;
        addr.length = 0;
        addr.contents = 0;
+       faddr.port = 0;
        break;
     }
     /* this address is in net order */
@@ -322,12 +323,13 @@ static void process_packet(port_fd, prog)
                (struct sockaddr *)&saddr, saddr_len);
     if (cc == -1) {
        char addrbuf[46];
-       int portno;
         krb5_free_data(kdc_context, response);
-       sockaddr2p ((struct sockaddr *) &saddr, addrbuf, sizeof (addrbuf),
-                   &portno);
+       if (inet_ntop(((struct sockaddr *)&saddr)->sa_family,
+                     addr.contents, addrbuf, sizeof(addrbuf)) == 0) {
+           strcpy(addrbuf, "?");
+       }
        com_err(prog, errno, "while sending reply to %s/%d",
-               addrbuf, ntohs(portno));
+               addrbuf, faddr.port);
        return;
     }
     if (cc != response->length) {

diff --git a/src/kdc/sock2p.c b/src/kdc/sock2p.c
deleted file mode 100644 (file)
index 736bb22..0000000
--- a/src/kdc/sock2p.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * kdc/sock2p.c
- *
- * Copyright 2000 by the Massachusetts Institute of Technology.
- *
- * Export of this software from the United States of America may
- *   require a specific license from the United States Government.
- *   It is the responsibility of any person or organization contemplating
- *   export to obtain such a license before exporting.
- * 
- * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
- * distribute this software and its documentation for any purpose and
- * without fee is hereby granted, provided that the above copyright
- * notice appear in all copies and that both that copyright notice and
- * this permission notice appear in supporting documentation, and that
- * the name of M.I.T. not be used in advertising or publicity pertaining
- * to distribution of the software without specific, written prior
- * permission.  Furthermore if you modify this software you must label
- * your software as modified software and not distribute it in such a
- * fashion that it might be confused with the original M.I.T. software.
- * M.I.T. makes no representations about the suitability of
- * this software for any purpose.  It is provided "as is" without express
- * or implied warranty.
- * 
- *
- * Network code for Kerberos v5 KDC.
- */
-
-#define NEED_SOCKETS
-#include "k5-int.h"
-#ifdef HAVE_NETINET_IN_H
-#include <sys/types.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
-#include "kdc_util.h"
-
-#if 0 /* if we really need this, put it into socket-utils.h or fake-addrinfo.h */
-
-#ifndef HAVE_INET_NTOP
-char *
-inet_ntop (int family, const void *address, char *buf, size_t bufsiz)
-{
-    char *p;
-    switch (family) {
-    case AF_INET:
-    {
-       p = inet_ntoa (*(const struct in_addr *)address);
-    try:
-       if (strlen (p) >= bufsiz)
-           return 0;
-       strcpy (buf, p);
-       break;
-    }
-#ifdef KRB5_USE_INET6
-    case AF_INET6:
-    {
-       char abuf[46];
-       const unsigned char *byte = (const unsigned char *)
-           &((const struct in6_addr *)address)->s6_addr;
-       sprintf (abuf, "%x:%x:%x:%x:%x:%x:%x:%x",
-                byte[0] * 256 + byte[1],
-                byte[2] * 256 + byte[3],
-                byte[4] * 256 + byte[5],
-                byte[6] * 256 + byte[7],
-                byte[8] * 256 + byte[9],
-                byte[10] * 256 + byte[11],
-                byte[12] * 256 + byte[13],
-                byte[14] * 256 + byte[15]);
-       p = abuf;
-       goto try;
-    }
-#endif /* KRB5_USE_INET6 */
-    default:
-       return 0;
-    }
-    return buf;
-}
-#endif
-
-#endif
-
-void
-sockaddr2p (const struct sockaddr *s, char *buf, size_t bufsiz, int *port_p)
-{
-    const void *addr;
-    int port;
-    switch (s->sa_family) {
-    case AF_INET:
-       addr = &((const struct sockaddr_in *)s)->sin_addr;
-       port = ((const struct sockaddr_in *)s)->sin_port;
-       break;
-#ifdef KRB5_USE_INET6
-    case AF_INET6:
-       addr = &((const struct sockaddr_in6 *)s)->sin6_addr;
-       port = ((const struct sockaddr_in6 *)s)->sin6_port;
-       break;
-#endif
-    default:
-       if (bufsiz >= 2)
-           strcpy (buf, "?");
-       if (port_p)
-           *port_p = -1;
-       return;
-    }
-    if (inet_ntop (s->sa_family, addr, buf, bufsiz) == 0 && bufsiz >= 2)
-       strcpy (buf, "?");
-    if (port_p)
-       *port_p = port;
-}
-
-#endif /* INET */