1 files changed, 3 insertions, 2 deletions

diff --git a/sshd.c b/sshd.c
index fc2d1d20e..70f292cc7 100644
--- a/sshd.c
+++ b/sshd.c
@@ -14,7 +14,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshd.c,v 1.111 2000/04/27 08:01:28 markus Exp $");
+RCSID("$OpenBSD: sshd.c,v 1.113 2000/05/01 20:34:51 markus Exp $");
 
 #include "xmalloc.h"
 #include "rsa.h"
@@ -190,6 +190,7 @@ sigterm_handler(int sig)
 {
         log("Received signal %d; terminating.", sig);
         close_listen_socks();
+        unlink(options.pid_file);
         exit(255);
 }
 
@@ -729,7 +730,7 @@ main(int ac, char **av)
                          * fail if there already is a daemon, and this will
                          * overwrite any old pid in the file.
                          */
-                        f = fopen(SSH_DAEMON_PID_FILE, "w");
+                        f = fopen(options.pid_file, "w");
                         if (f) {
                                 fprintf(f, "%u\n", (unsigned int) getpid());
                                 fclose(f);