summaryrefslogtreecommitdiffhomepage
path: root/svr-session.c
diff options
context:
space:
mode:
authorMatt Johnston <matt@ucc.asn.au>2012-04-09 20:35:13 +0800
committerMatt Johnston <matt@ucc.asn.au>2012-04-09 20:35:13 +0800
commit49b79fa02d93a507df6caf93d3f4545ab057bea5 (patch)
tree1582d0634668a4920a2142ea2535831547ccb11c /svr-session.c
parentc957edbe759ba8d708a882dcb9ab3b2aa1a72ad1 (diff)
Rename HAVE_FORK to USE_VFORK
It makes it a bit more obvious why there's a test there since HAVE_FORK is the normal case.
Diffstat (limited to 'svr-session.c')
-rw-r--r--svr-session.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/svr-session.c b/svr-session.c
index 7703a8f..ac73dab 100644
--- a/svr-session.c
+++ b/svr-session.c
@@ -84,7 +84,7 @@ void svr_session(int sock, int childpipe) {
/* Initialise server specific parts of the session */
svr_ses.childpipe = childpipe;
-#ifndef HAVE_FORK
+#ifdef USE_VFORK
svr_ses.server_pid = getpid();
#endif
svr_authinitialise();
@@ -157,12 +157,10 @@ void svr_dropbear_exit(int exitcode, const char* format, va_list param) {
_dropbear_log(LOG_INFO, fmtbuf, param);
-#ifndef HAVE_FORK
- /* only the main server process should cleanup - we don't want
+#ifdef USE_VFORK
+ /* For uclinux only the main server process should cleanup - we don't want
* forked children doing that */
if (svr_ses.server_pid == getpid())
-#else
- if (1)
#endif
{
/* free potential public key options */