- (djm) Merge OpenBSD changes:
- [email protected] 2000/09/05 02:59:57
[session.c]
print hostname (not hushlogin)
- [email protected] 2000/09/05 13:18:48
[authfile.c ssh-add.c]
enable ssh-add -d for DSA keys
- [email protected] 2000/09/05 13:20:49
[sftp-server.c]
cleanup
- [email protected] 2000/09/06 03:46:41
[authfile.h]
prototype
- [email protected] 2000/09/07 14:27:56
[ALL]
cleanup copyright notices on all files. I have attempted to be
accurate with the details. everything is now under Tatu's licence
(which I copied from his readme), and/or the core-sdi bsd-ish thing
for deattack, or various openbsd developers under a 2-term bsd
licence. We're not changing any rules, just being accurate.
- [email protected] 2000/09/07 14:40:30
[channels.c channels.h clientloop.c serverloop.c ssh.c]
cleanup window and packet sizes for ssh2 flow control; ok niels
- [email protected] 2000/09/07 14:53:00
[scp.c]
typo
- [email protected] 2000/09/07 15:13:37
[auth-options.c auth-options.h auth-rh-rsa.c auth-rsa.c auth.c]
[authfile.h canohost.c channels.h compat.c hostfile.h log.c match.h]
[pty.c readconf.c]
some more Copyright fixes
- [email protected] 2000/09/08 03:02:51
[README.openssh2]
bye bye
- [email protected] 2000/09/11 18:38:33
[LICENCE cipher.c]
a few more comments about it being ARC4 not RC4
- [email protected] 2000/09/12 14:53:11
[log-client.c log-server.c log.c ssh.1 ssh.c ssh.h sshd.8 sshd.c]
multiple debug levels
- [email protected] 2000/09/14 14:25:15
[clientloop.c]
typo
- [email protected] 2000/09/15 01:13:51
[ssh-agent.c]
check return value for setenv(3) for failure, and deal appropriately
diff --git a/canohost.c b/canohost.c
index 7ded0e3..98ce974 100644
--- a/canohost.c
+++ b/canohost.c
@@ -1,20 +1,18 @@
/*
- *
- * canohost.c
- *
* Author: Tatu Ylonen <[email protected]>
- *
* Copyright (c) 1995 Tatu Ylonen <[email protected]>, 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.13 2000/06/20 01:39:39 markus Exp $");
+RCSID("$OpenBSD: canohost.c,v 1.15 2000/09/07 21:13:37 markus Exp $");
#include "packet.h"
#include "xmalloc.h"
