Windows global stuff:

[krb5.git] / src / lib / krb5 / os / port2ip.c

diff --git a/src/lib/krb5/os/port2ip.c b/src/lib/krb5/os/port2ip.c
index 48ecc902b3ccc1dcc3b40edfba8c99cd6a392505..531e61a470823b70ee0d7487cbd54d6b417a0c46 100644 (file)
--- a/src/lib/krb5/os/port2ip.c
+++ b/src/lib/krb5/os/port2ip.c
@@ -1,42 +1,47 @@
 /*
- * $Source$
- * $Author$
+ * lib/krb5/os/port2ip.c
  *
  * Copyright 1991 by the Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
- * For copying and distribution information, please see the file
- * <krb5/copyright.h>.
+ * 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.  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.
+ * 
  *
  * Take an ADDRPORT address and split into IP addr & port.
  */
 
-#if !defined(lint) && !defined(SABER)
-static char rcsid_port2ip_c[] =
-"$Id$";
-#endif /* !lint & !SABER */
-
-#include <krb5/krb5.h>
-#include <krb5/osconf.h>
+#define NEED_SOCKETS
+#include "k5-int.h"
 
 #ifdef KRB5_USE_INET
-
-#include <krb5/ext-proto.h>
-#include <krb5/libos-proto.h>
 #include "os-proto.h"
-#include <netinet/in.h>
 
 krb5_error_code
-krb5_unpack_full_ipaddr(inaddr, adr, port)
-const krb5_address *inaddr;
-krb5_int32 *adr;
-krb5_int16 *port;
+krb5_unpack_full_ipaddr(context, inaddr, adr, port)
+    krb5_context context;
+    const krb5_address *inaddr;
+    krb5_int32 *adr;
+    krb5_int16 *port;
 {
     unsigned long smushaddr;
     unsigned short smushport;
     register krb5_octet *marshal;
     krb5_addrtype temptype;
-    krb5_int32 templength;
+    krb5_ui_4 templength;
 
     if (inaddr->addrtype != ADDRTYPE_ADDRPORT)
        return KRB5_PROG_ATYPE_NOSUPP;