=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/canohost.c,v retrieving revision 1.12.2.1 retrieving revision 1.12.2.2 diff -u -r1.12.2.1 -r1.12.2.2 --- src/usr.bin/ssh/canohost.c 2000/09/01 18:23:18 1.12.2.1 +++ src/usr.bin/ssh/canohost.c 2000/11/08 21:30:31 1.12.2.2 @@ -1,20 +1,18 @@ /* - * - * canohost.c - * * Author: Tatu Ylonen - * * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland * All rights reserved - * - * Created: Sun Jul 2 17:52:22 1995 ylo - * * Functions for returning the canonical host name of the remote site. * + * As far as I am concerned, the code I have written for this software + * can be used freely for any purpose. Any derived versions of this + * software must be clearly marked as such, and if the derived work is + * incompatible with the protocol description in the RFC file, it must be + * called by a name other than "ssh" or "Secure Shell". */ #include "includes.h" -RCSID("$OpenBSD: canohost.c,v 1.12.2.1 2000/09/01 18:23:18 jason Exp $"); +RCSID("$OpenBSD: canohost.c,v 1.12.2.2 2000/11/08 21:30:31 jason Exp $"); #include "packet.h" #include "xmalloc.h" @@ -125,7 +123,7 @@ else ipproto = IPPROTO_IP; option_size = sizeof(options); - if (getsockopt(0, ipproto, IP_OPTIONS, (char *) options, + if (getsockopt(socket, ipproto, IP_OPTIONS, (char *) options, &option_size) >= 0 && option_size != 0) { cp = text; /* Note: "text" buffer must be at least 3x as big as options. */