From 834e99404239a4497f733fd31c8fa20bb422613d Mon Sep 17 00:00:00 2001 From: Greg Alexander Date: Tue, 16 Dec 2014 18:31:18 -0500 Subject: [PATCH] put the pid file under conf_path_file() --- dropbear/options.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dropbear/options.h b/dropbear/options.h index a3b25d9..1b6ce53 100644 --- a/dropbear/options.h +++ b/dropbear/options.h @@ -5,6 +5,8 @@ #ifndef _OPTIONS_H_ #define _OPTIONS_H_ +extern const char *conf_path_file(const char *fn); /* in jni/interface.c */ + /* Define compile-time options below - the "#ifndef DROPBEAR_XXX .... #endif" * parts are to allow for commandline -DDROPBEAR_XXX options etc. */ @@ -19,8 +21,6 @@ #define DROPBEAR_DEFADDRESS "" #endif -extern const char *conf_path_file(const char *fn); /* in jni/interface.c */ - /* Default hostkey paths - these can be specified on the command line */ #ifndef DSS_PRIV_FILENAME #define DSS_PRIV_FILENAME conf_path_file("dropbear_dss_host_key") @@ -259,7 +259,7 @@ much traffic. */ /* The default file to store the daemon's process ID, for shutdown scripts etc. This can be overridden with the -P flag */ -#undef DROPBEAR_PIDFILE +#define DROPBEAR_PIDFILE conf_path_file("dropbear.pid") /* The command to invoke for xauth when using X11 forwarding. * "-q" for quiet */