summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/channels.h4
-rw-r--r--usr.bin/ssh/nchan.c4
-rw-r--r--usr.bin/ssh/serverloop.c2
-rw-r--r--usr.bin/ssh/session.c4
-rw-r--r--usr.bin/ssh/sshd.c4
5 files changed, 9 insertions, 9 deletions
diff --git a/usr.bin/ssh/channels.h b/usr.bin/ssh/channels.h
index 0ea881ffe26..7816752e835 100644
--- a/usr.bin/ssh/channels.h
+++ b/usr.bin/ssh/channels.h
@@ -1,4 +1,4 @@
-/* RCSID("$Id: channels.h,v 1.10 2000/04/28 08:10:20 markus Exp $"); */
+/* RCSID("$Id: channels.h,v 1.11 2000/05/02 12:44:38 markus Exp $"); */
#ifndef CHANNELS_H
#define CHANNELS_H
@@ -56,7 +56,7 @@ typedef struct Channel {
char *ctype; /* type */
- // callback
+ /* callback */
channel_callback_fn *cb_fn;
void *cb_arg;
int cb_event;
diff --git a/usr.bin/ssh/nchan.c b/usr.bin/ssh/nchan.c
index f592d487998..3d4313a37a5 100644
--- a/usr.bin/ssh/nchan.c
+++ b/usr.bin/ssh/nchan.c
@@ -28,7 +28,7 @@
*/
#include "includes.h"
-RCSID("$Id: nchan.c,v 1.14 2000/04/14 10:30:32 markus Exp $");
+RCSID("$Id: nchan.c,v 1.15 2000/05/02 12:44:38 markus Exp $");
#include "ssh.h"
@@ -314,7 +314,7 @@ chan_write_failed2(Channel *c)
switch (c->ostate) {
case CHAN_OUTPUT_OPEN:
debug("channel %d: output open -> closed", c->self);
- chan_shutdown_write(c); // ??
+ chan_shutdown_write(c); /* ?? */
c->ostate = CHAN_OUTPUT_CLOSED;
break;
case CHAN_OUTPUT_WAIT_DRAIN:
diff --git a/usr.bin/ssh/serverloop.c b/usr.bin/ssh/serverloop.c
index 0f8381542db..9bf31275bea 100644
--- a/usr.bin/ssh/serverloop.c
+++ b/usr.bin/ssh/serverloop.c
@@ -165,7 +165,7 @@ retry_select:
* stdin or channel data.
*/
if (compat20) {
- // wrong: bad conditionXXX
+ /* wrong: bad condition XXX */
if (channel_not_very_much_buffered_data())
FD_SET(connection_in, readset);
} else {
diff --git a/usr.bin/ssh/session.c b/usr.bin/ssh/session.c
index 25a5cd0cab9..347eb8622be 100644
--- a/usr.bin/ssh/session.c
+++ b/usr.bin/ssh/session.c
@@ -8,7 +8,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: session.c,v 1.10 2000/05/02 08:05:32 markus Exp $");
+RCSID("$OpenBSD: session.c,v 1.11 2000/05/02 12:44:38 markus Exp $");
#include "xmalloc.h"
#include "ssh.h"
@@ -551,7 +551,7 @@ do_exec_pty(Session *s, const char *command, struct passwd * pw)
/* Close the extra descriptor for the pseudo tty. */
close(ttyfd);
-///XXXX ? move to do_child() ??
+/* XXXX ? move to do_child() ??*/
/*
* Get IP address of client. This is needed because we want
* to record where the user logged in from. If the
diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c
index e94f7074d1a..7f173a1e34e 100644
--- a/usr.bin/ssh/sshd.c
+++ b/usr.bin/ssh/sshd.c
@@ -14,7 +14,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.113 2000/05/01 20:34:51 markus Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.114 2000/05/02 12:44:38 markus Exp $");
#include "xmalloc.h"
#include "rsa.h"
@@ -1310,7 +1310,7 @@ do_ssh2_kex()
/* send server hostkey, DH pubkey 'f' and singed H */
packet_start(SSH2_MSG_KEXDH_REPLY);
packet_put_string((char *)server_host_key_blob, sbloblen);
- packet_put_bignum2(dh->pub_key); // f
+ packet_put_bignum2(dh->pub_key); /* f */
packet_put_string((char *)signature, slen);
packet_send();
xfree(signature);