[19103] in Kerberos
New cygwin patches for krb5-1.3-alpha2 and krb5-current (snapshot)
daemon@ATHENA.MIT.EDU (Christopher B. Liebman)
Sun Apr 20 17:49:04 2003
Message-ID: <003a01c30786$789468b0$0401010a@XYZZY>
From: "Christopher B. Liebman" <liebman@zod.com>
To: <cygwin@cygwin.com>
Date: Sun, 20 Apr 2003 14:47:41 -0700
MIME-Version: 1.0
Content-Type: multipart/mixed;
boundary="----=_NextPart_000_0037_01C3074B.CBA75A70"
cc: kerberos@mit.edu
Errors-To: kerberos-bounces@mit.edu
This is a multi-part message in MIME format.
------=_NextPart_000_0037_01C3074B.CBA75A70
Content-Type: text/plain;
charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
I have both clients and servers working. tested on Win2K. This patch
applies cleanly to both krb5-current and krb5-1.3-alpha2.
-- Chris
------=_NextPart_000_0037_01C3074B.CBA75A70
Content-Type: application/octet-stream;
name="krb5-current.cygwin.patch"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
filename="krb5-current.cygwin.patch"
diff -u -r krb5-current-dist/src/kdc/dispatch.c =
krb5-current/src/kdc/dispatch.c=0A=
--- krb5-current-dist/src/kdc/dispatch.c 2002-09-17 00:00:34.000000000 =
-0700=0A=
+++ krb5-current/src/kdc/dispatch.c 2003-04-20 14:03:26.000000000 -0700=0A=
@@ -55,8 +55,20 @@=0A=
const char *name =3D 0;=0A=
char buf[46];=0A=
=0A=
+#ifdef HAVE_INET_NTOP=0A=
name =3D inet_ntop (ADDRTYPE2FAMILY (from->address->addrtype),=0A=
from->address->contents, buf, sizeof (buf));=0A=
+#else=0A=
+ if (from->address->addrtype =3D=3D ADDRTYPE_INET) {=0A=
+ struct sockaddr_in *sin=0A=
+ =3D (struct sockaddr_in *)from->address->contents;=0A=
+ if (name =3D inet_ntoa (sin->sin_addr))=0A=
+ {=0A=
+ strcpy (buf, name);=0A=
+ name =3D buf;=0A=
+ }=0A=
+ }=0A=
+#endif=0A=
if (name =3D=3D 0)=0A=
name =3D "[unknown address type]";=0A=
krb5_klog_syslog(LOG_INFO,=0A=
diff -u -r krb5-current-dist/src/kdc/do_as_req.c =
krb5-current/src/kdc/do_as_req.c=0A=
--- krb5-current-dist/src/kdc/do_as_req.c 2002-11-04 00:00:44.000000000 =
-0800=0A=
+++ krb5-current/src/kdc/do_as_req.c 2003-04-20 13:57:28.000000000 -0700=0A=
@@ -89,9 +89,14 @@=0A=
ktypes2str(ktypestr, sizeof(ktypestr),=0A=
request->nktypes, request->ktype);=0A=
=0A=
+#ifdef HAVE_INET_NTOP=0A=
fromstring =3D inet_ntop(ADDRTYPE2FAMILY (from->address->addrtype),=0A=
from->address->contents,=0A=
fromstringbuf, sizeof(fromstringbuf));=0A=
+#else=0A=
+ if (from->address->addrtype =3D=3D ADDRTYPE_INET)=0A=
+ fromstring =3D (char *) inet_ntoa(*(struct in_addr =
*)from->address->contents);=0A=
+#endif=0A=
if (!fromstring)=0A=
fromstring =3D "<unknown>";=0A=
=0A=
diff -u -r krb5-current-dist/src/kdc/do_tgs_req.c =
krb5-current/src/kdc/do_tgs_req.c=0A=
--- krb5-current-dist/src/kdc/do_tgs_req.c 2003-04-02 00:00:46.000000000 =
-0800=0A=
+++ krb5-current/src/kdc/do_tgs_req.c 2003-04-20 13:57:28.000000000 -0700=0A=
@@ -103,9 +103,15 @@=0A=
if ((retval =3D setup_server_realm(request->server)))=0A=
return retval;=0A=
=0A=
+#ifdef HAVE_INET_NTOP=0A=
fromstring =3D inet_ntop(ADDRTYPE2FAMILY(from->address->addrtype),=0A=
from->address->contents,=0A=
fromstringbuf, sizeof(fromstringbuf));=0A=
+#else=0A=
+ if (from->address->addrtype =3D=3D ADDRTYPE_INET)=0A=
+ fromstring =3D=0A=
+ (char *) inet_ntoa(*(struct in_addr *)from->address->contents);=0A=
+#endif=0A=
if (!fromstring)=0A=
fromstring =3D "<unknown>";=0A=
=0A=
diff -u -r krb5-current-dist/src/kdc/network.c =
krb5-current/src/kdc/network.c=0A=
--- krb5-current-dist/src/kdc/network.c 2003-01-04 00:00:42.000000000 =
-0800=0A=
+++ krb5-current/src/kdc/network.c 2003-04-20 13:57:28.000000000 -0700=0A=
@@ -742,10 +742,24 @@=0A=
if (cc =3D=3D -1) {=0A=
char addrbuf[46];=0A=
krb5_free_data(kdc_context, response);=0A=
+#ifdef HAVE_INET_NTOP=0A=
if (inet_ntop(((struct sockaddr *)&saddr)->sa_family,=0A=
addr.contents, addrbuf, sizeof(addrbuf)) =3D=3D 0) {=0A=
strcpy(addrbuf, "?");=0A=
}=0A=
+#else=0A=
+ {=0A=
+ char* addrstr;=0A=
+ if (addrstr =3D inet_ntoa(((struct sockaddr_in =
*)&saddr)->sin_addr))=0A=
+ {=0A=
+ strncpy(addrbuf, addrstr, sizeof(addrbuf));=0A=
+ }=0A=
+ else=0A=
+ {=0A=
+ strcpy(addrbuf, "?");=0A=
+ }=0A=
+ }=0A=
+#endif=0A=
com_err(prog, errno, "while sending reply to %s/%d",=0A=
addrbuf, faddr.port);=0A=
return;=0A=
diff -u -r krb5-current-dist/src/lib/krb5/rcache/rc_io.c =
krb5-current/src/lib/krb5/rcache/rc_io.c=0A=
--- krb5-current-dist/src/lib/krb5/rcache/rc_io.c 2002-09-17 =
00:01:00.000000000 -0700=0A=
+++ krb5-current/src/lib/krb5/rcache/rc_io.c 2003-04-20 =
13:58:10.000000000 -0700=0A=
@@ -271,7 +271,7 @@=0A=
krb5_rc_io_move(krb5_context context, krb5_rc_iostuff *new1,=0A=
krb5_rc_iostuff *old)=0A=
{=0A=
-#if defined(_WIN32)=0A=
+#if defined(_WIN32) || defined(__CYGWIN__)=0A=
char *new_fn =3D NULL;=0A=
char *old_fn =3D NULL;=0A=
off_t offset =3D 0;=0A=
------=_NextPart_000_0037_01C3074B.CBA75A70
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
________________________________________________
Kerberos mailing list Kerberos@mit.edu
https://mailman.mit.edu/mailman/listinfo/kerberos
------=_NextPart_000_0037_01C3074B.CBA75A70--
