Mercurial > dropbear
diff svr-runopts.c @ 1921:284c3837891c
Allow user space file locations (rootless support)
Why:
Running dropbear as a user (rootless) is aided if
files and programs can be saved/removed without
needing sudo.
What:
Use the same convention as DROPBEAR_DEFAULT_CLI_AUTHKEY;
if not starting with '/', then is relative to hedge's /home/hedge:
*_PRIV_FILENAME
DROPBEAR_PIDFILE
SFTPSERVER_PATH
default_options.h commentary added.
Changes kept to a minimum, so log entry in svr_kex.c#163
is refactored.
From:
Generated hostkey is <path> ... <finger-print>
to:
Generated hostkey path is <path>
Generated hostkey fingerprint is <fp>
Otherwise the unexpanded path was reported.
Patch modified by Matt Johnston
Signed-off-by: Begley Brothers Inc <[email protected]>
| author | Begley Brothers Inc <begleybrothers@gmail.com> |
|---|---|
| date | Thu, 09 Jul 2020 17:47:58 +1000 |
| parents | be236878efcf |
| children | 4528afefe45d |
line wrap: on
line diff
--- a/svr-runopts.c Wed Mar 30 12:56:09 2022 +0800 +++ b/svr-runopts.c Thu Jul 09 17:47:58 2020 +1000 @@ -163,7 +163,7 @@ svr_opts.portcount = 0; svr_opts.hostkey = NULL; svr_opts.delay_hostkey = 0; - svr_opts.pidfile = DROPBEAR_PIDFILE; + svr_opts.pidfile = expand_homedir_path(DROPBEAR_PIDFILE); #if DROPBEAR_SVR_LOCALTCPFWD svr_opts.nolocaltcp = 0; #endif @@ -530,12 +530,14 @@ /* Must be called after syslog/etc is working */ static void loadhostkey(const char *keyfile, int fatal_duplicate) { sign_key * read_key = new_sign_key(); + char *expand_path = expand_homedir_path(keyfile); enum signkey_type type = DROPBEAR_SIGNKEY_ANY; - if (readhostkey(keyfile, read_key, &type) == DROPBEAR_FAILURE) { + if (readhostkey(expand_path, read_key, &type) == DROPBEAR_FAILURE) { if (!svr_opts.delay_hostkey) { - dropbear_log(LOG_WARNING, "Failed loading %s", keyfile); + dropbear_log(LOG_WARNING, "Failed loading %s", expand_path); } } + m_free(expand_path); #if DROPBEAR_RSA if (type == DROPBEAR_SIGNKEY_RSA) {