diff options
| author |   markus <markus@openbsd.org> | 2000-12-28 12:03:57 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2000-12-28 12:03:57 +0000 |
| commit | cd6885115d22806760aa293cf947502f13bf0ba5 (patch) | |
| tree | 99465639b373188eade81a5e925b825ddd21448e | |
| parent | make it obvious the key/authkey pairs can be distinct; Gordon Greene. (diff) | |
| download | wireguard-openbsd-cd6885115d22806760aa293cf947502f13bf0ba5.tar.xz wireguard-openbsd-cd6885115d22806760aa293cf947502f13bf0ba5.zip | |
document -D
| -rw-r--r-- | usr.bin/ssh/sshd.8 | 4 | ||||
| -rw-r--r-- | usr.bin/ssh/sshd.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/usr.bin/ssh/sshd.8 b/usr.bin/ssh/sshd.8 index 85d6362acce..b2ff9a3e0ca 100644 --- a/usr.bin/ssh/sshd.8 +++ b/usr.bin/ssh/sshd.8 @@ -34,7 +34,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $OpenBSD: sshd.8,v 1.75 2000/12/27 11:41:31 markus Exp $ +.\" $OpenBSD: sshd.8,v 1.76 2000/12/28 12:03:57 markus Exp $ .Dd September 25, 1999 .Dt SSHD 8 .Os @@ -261,7 +261,7 @@ When this option is specified .Nm will not detach and does not become a daemon. This allows easy monitoring of -.Nm . +.Nm sshd . .It Fl Q Do not print an error message if RSA support is missing. .It Fl V Ar client_protocol_id diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c index f8439db5271..f101116c9b8 100644 --- a/usr.bin/ssh/sshd.c +++ b/usr.bin/ssh/sshd.c @@ -40,7 +40,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshd.c,v 1.143 2000/12/27 12:34:50 markus Exp $"); +RCSID("$OpenBSD: sshd.c,v 1.144 2000/12/28 12:03:58 markus Exp $"); #include "xmalloc.h" #include "rsa.h" @@ -640,6 +640,7 @@ main(int ac, char **av) fprintf(stderr, " -f file Configuration file (default %s)\n", SERVER_CONFIG_FILE); fprintf(stderr, " -d Debugging mode (multiple -d means more debugging)\n"); fprintf(stderr, " -i Started from inetd\n"); + fprintf(stderr, " -D Do not fork into daemon mode\n"); fprintf(stderr, " -q Quiet (no logging)\n"); fprintf(stderr, " -p port Listen on the specified port (default: 22)\n"); fprintf(stderr, " -k seconds Regenerate server key every this many seconds (default: 3600)\n"); |