src/usr.bin/ssh/scp.c - diff

Return to scp.c CVS log

Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/scp.c between version 1.37 and 1.38

-version 1.37, 2000/09/01 15:25:13
+version 1.38, 2000/09/07 20:27:53
 Line 1
 Line 1
 Line 1
  /*
+  * scp - secure remote copy.  This is basically patched BSD rcp which
+  * uses ssh to do the data transfer (instead of using rcmd).
   *
-  * scp - secure remote copy.  This is basically patched BSD rcp which uses ssh
+  * NOTE: This version should NOT be suid root.  (This uses ssh to
-  * to do the data transfer (instead of using rcmd).
+  * do the transfer and ssh has the necessary privileges.)
   *
-  * NOTE: This version should NOT be suid root.  (This uses ssh to do the transfer
-  * and ssh has the necessary privileges.)
-  *
   * 1995 Timo Rinne <tri@iki.fi>, Tatu Ylonen <ylo@cs.hut.fi>
   *
- */
+  * 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".
+  *
+ /*
+  * Copyright (c) 1999 Theo de Raadt. All rights reserved.
+  * Copyright (c) 1999 Aaron Campbell. All rights reserved.
+  *
+  * Redistribution and use in source and binary forms, with or without
+  * modification, are permitted provided that the following conditions
+  * are met:
+  * 1. Redistributions of source code must retain the above copyright
+  *    notice, this list of conditions and the following disclaimer.
+  * 2. Redistributions in binary form must reproduce the above copyright
+  *    notice, this list of conditions and the following disclaimer in the
+  *    documentation and/or other materials provided with the distribution.
+  *
+  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
  /*
   * Parts from: