diff options
| author |   djm <djm@openbsd.org> | 2020-07-05 23:59:45 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2020-07-05 23:59:45 +0000 |
| commit | 5bde2954c180034a27b079acaff46073dc75139b (patch) | |
| tree | 864f6950d3deb10cfd7d01a2968cbd45bd1260d2 /usr.bin/ssh/ssh.c | |
| parent | spelling/grammar fixes (diff) | |
| download | wireguard-openbsd-5bde2954c180034a27b079acaff46073dc75139b.tar.xz wireguard-openbsd-5bde2954c180034a27b079acaff46073dc75139b.zip | |
some language improvements; ok markus
Diffstat (limited to 'usr.bin/ssh/ssh.c')
| -rw-r--r-- | usr.bin/ssh/ssh.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c index 3cd24df7600..e7efcc628f0 100644 --- a/usr.bin/ssh/ssh.c +++ b/usr.bin/ssh/ssh.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh.c,v 1.530 2020/06/26 05:02:03 dtucker Exp $ */ +/* $OpenBSD: ssh.c,v 1.531 2020/07/05 23:59:45 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -121,11 +121,11 @@ int stdin_null_flag = 0; /* * Flag indicating that the current process should be backgrounded and - * a new slave launched in the foreground for ControlPersist. + * a new mux-client launched in the foreground for ControlPersist. */ int need_controlpersist_detach = 0; -/* Copies of flags for ControlPersist foreground slave */ +/* Copies of flags for ControlPersist foreground mux-client */ int ostdin_null_flag, ono_shell_flag, otty_flag, orequest_tty; /* @@ -1670,7 +1670,7 @@ control_persist_detach(void) /* Child: master process continues mainloop */ break; default: - /* Parent: set up mux slave to connect to backgrounded master */ + /* Parent: set up mux client to connect to backgrounded master */ debug2("%s: background process is %ld", __func__, (long)pid); stdin_null_flag = ostdin_null_flag; options.request_tty = orequest_tty; @@ -2049,9 +2049,9 @@ ssh_session2(struct ssh *ssh, struct passwd *pw) /* * If we are in control persist mode and have a working mux listen * socket, then prepare to background ourselves and have a foreground - * client attach as a control slave. + * client attach as a control client. * NB. we must save copies of the flags that we override for - * the backgrounding, since we defer attachment of the slave until + * the backgrounding, since we defer attachment of the client until * after the connection is fully established (in particular, * async rfwd replies have been received for ExitOnForwardFailure). */ |