- More reformatting merged from OpenBSD CVS

[openssh.git] / nchan.c

diff --git a/nchan.c b/nchan.c
index 97101e36d2de8ce3939db07564f687621116125c..9bcad647b8edeb06ca61f54d3b2d2cc0670f17e3 100644 (file)
--- a/nchan.c
+++ b/nchan.c
@@ -1,3 +1,32 @@
+/*
+ * Copyright (c) 1999 Markus Friedl.  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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *      This product includes software developed by Markus Friedl.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * 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.
+ */
+
 #include "includes.h"
 RCSID("$Id$");
 
@@ -173,9 +202,10 @@ chan_send_oclose(Channel *c)
 static void
 chan_shutdown_write(Channel *c)
 {
+       /* shutdown failure is allowed if write failed already */
        debug("channel %d: shutdown_write", c->self);
        if (shutdown(c->sock, SHUT_WR) < 0)
-               error("chan_shutdown_write failed for #%d/fd%d: %.100s",
+               debug("chan_shutdown_write failed for #%d/fd%d: %.100s",
                      c->self, c->sock, strerror(errno));
 }
 static void