summaryrefslogtreecommitdiff
path: root/sshd.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2000-12-06 01:42:49 +0000
committerBen Lindstrom <mouring@eviladmin.org>2000-12-06 01:42:49 +0000
commit7ad971033417ac7d0fc49ccba89f70b3dec93b64 (patch)
tree9aca8f04c1d545d057185fc7675c554c1d92a216 /sshd.c
parent3c51676a565badf61cb30def91d7a910e8ae41b7 (diff)
20001206
- (bal) OpenSSH CVS updates: - markus@cvs.openbsd.org 2000/12/05 20:34:09 [channels.c channels.h clientloop.c serverloop.c] async connects for -R/-L; ok deraadt@ - todd@cvs.openssh.org 2000/12/05 16:47:28 [sshd.c] tweak comment to reflect real location of pid file; ok provos@
Diffstat (limited to 'sshd.c')
-rw-r--r--sshd.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sshd.c b/sshd.c
index 4a01ebec7..4bd0cbe88 100644
--- a/sshd.c
+++ b/sshd.c
@@ -40,7 +40,7 @@
40 */ 40 */
41 41
42#include "includes.h" 42#include "includes.h"
43RCSID("$OpenBSD: sshd.c,v 1.135 2000/11/29 21:11:59 markus Exp $"); 43RCSID("$OpenBSD: sshd.c,v 1.136 2000/12/05 16:47:28 todd Exp $");
44 44
45#include "xmalloc.h" 45#include "xmalloc.h"
46#include "rsa.h" 46#include "rsa.h"
@@ -881,9 +881,9 @@ main(int ac, char **av)
881 881
882 if (!debug_flag) { 882 if (!debug_flag) {
883 /* 883 /*
884 * Record our pid in /etc/sshd_pid to make it easier 884 * Record our pid in /var/run/sshd.pid to make it
885 * to kill the correct sshd. We don\'t want to do 885 * easier to kill the correct sshd. We don't want to
886 * this before the bind above because the bind will 886 * do this before the bind above because the bind will
887 * fail if there already is a daemon, and this will 887 * fail if there already is a daemon, and this will
888 * overwrite any old pid in the file. 888 * overwrite any old pid in the file.
889 */ 889 */