summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-01-22 23:29:03 +1100
committerDamien Miller <djm@mindrot.org>2002-01-22 23:29:03 +1100
commitb51ed391618d5c5ac5b7950a4743f45d5cf5898e (patch)
tree7b28a64db870b6cd4bdfad1013f8cfc22b39fdaf
parent5144df92616ff8ed4fa3aa709651333c09d850b4 (diff)
- markus@cvs.openbsd.org 2002/01/14 13:57:03
[channels.h nchan.c] (c) 2002
-rw-r--r--ChangeLog5
-rw-r--r--channels.h4
-rw-r--r--nchan.c4
3 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index dc251c6a7..e38f073ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -179,6 +179,9 @@
179 - markus@cvs.openbsd.org 2002/01/14 13:55:55 179 - markus@cvs.openbsd.org 2002/01/14 13:55:55
180 [channels.c channels.h nchan.c] 180 [channels.c channels.h nchan.c]
181 remove function pointers for events, remove chan_init*; ok provos@ 181 remove function pointers for events, remove chan_init*; ok provos@
182 - markus@cvs.openbsd.org 2002/01/14 13:57:03
183 [channels.h nchan.c]
184 (c) 2002
182 185
18320020121 18620020121
184 - (djm) Rework ssh-rand-helper: 187 - (djm) Rework ssh-rand-helper:
@@ -7326,4 +7329,4 @@
7326 - Wrote replacements for strlcpy and mkdtemp 7329 - Wrote replacements for strlcpy and mkdtemp
7327 - Released 1.0pre1 7330 - Released 1.0pre1
7328 7331
7329$Id: ChangeLog,v 1.1773 2002/01/22 12:28:45 djm Exp $ 7332$Id: ChangeLog,v 1.1774 2002/01/22 12:29:03 djm Exp $
diff --git a/channels.h b/channels.h
index 9f97488b2..3422d9644 100644
--- a/channels.h
+++ b/channels.h
@@ -10,7 +10,7 @@
10 * called by a name other than "ssh" or "Secure Shell". 10 * called by a name other than "ssh" or "Secure Shell".
11 */ 11 */
12/* 12/*
13 * Copyright (c) 1999, 2000, 2001 Markus Friedl. All rights reserved. 13 * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved.
14 * 14 *
15 * Redistribution and use in source and binary forms, with or without 15 * Redistribution and use in source and binary forms, with or without
16 * modification, are permitted provided that the following conditions 16 * modification, are permitted provided that the following conditions
@@ -32,7 +32,7 @@
32 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 32 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
33 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 33 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
34 */ 34 */
35/* RCSID("$OpenBSD: channels.h,v 1.58 2002/01/14 13:55:55 markus Exp $"); */ 35/* RCSID("$OpenBSD: channels.h,v 1.59 2002/01/14 13:57:03 markus Exp $"); */
36 36
37#ifndef CHANNEL_H 37#ifndef CHANNEL_H
38#define CHANNEL_H 38#define CHANNEL_H
diff --git a/nchan.c b/nchan.c
index ebb8e6858..070f14a7a 100644
--- a/nchan.c
+++ b/nchan.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 1999, 2000, 2001 Markus Friedl. All rights reserved. 2 * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: nchan.c,v 1.42 2002/01/14 13:55:55 markus Exp $"); 26RCSID("$OpenBSD: nchan.c,v 1.43 2002/01/14 13:57:03 markus Exp $");
27 27
28#include "ssh1.h" 28#include "ssh1.h"
29#include "ssh2.h" 29#include "ssh2.h"