comparison default_options.h @ 1924:667937351c31

Fix tilde expansion of paths (Part was missed from previous series of commits)
author Matt Johnston <matt@ucc.asn.au>
date Wed, 30 Mar 2022 14:08:15 +0800
parents 70f05f7d4d11
children 299f4f19ba19
comparison
equal deleted inserted replaced
1923:ffa0f666fde2 1924:667937351c31
17 17
18 /* Listen on all interfaces */ 18 /* Listen on all interfaces */
19 #define DROPBEAR_DEFADDRESS "" 19 #define DROPBEAR_DEFADDRESS ""
20 20
21 /* Default hostkey paths - these can be specified on the command line. 21 /* Default hostkey paths - these can be specified on the command line.
22 * Homedir is prepended if path begins with ~ 22 * Homedir is prepended if path begins with ~/
23 */ 23 */
24 #define DSS_PRIV_FILENAME "/etc/dropbear/dropbear_dss_host_key" 24 #define DSS_PRIV_FILENAME "/etc/dropbear/dropbear_dss_host_key"
25 #define RSA_PRIV_FILENAME "/etc/dropbear/dropbear_rsa_host_key" 25 #define RSA_PRIV_FILENAME "/etc/dropbear/dropbear_rsa_host_key"
26 #define ECDSA_PRIV_FILENAME "/etc/dropbear/dropbear_ecdsa_host_key" 26 #define ECDSA_PRIV_FILENAME "/etc/dropbear/dropbear_ecdsa_host_key"
27 #define ED25519_PRIV_FILENAME "/etc/dropbear/dropbear_ed25519_host_key" 27 #define ED25519_PRIV_FILENAME "/etc/dropbear/dropbear_ed25519_host_key"
236 /* Client authentication options */ 236 /* Client authentication options */
237 #define DROPBEAR_CLI_PASSWORD_AUTH 1 237 #define DROPBEAR_CLI_PASSWORD_AUTH 1
238 #define DROPBEAR_CLI_PUBKEY_AUTH 1 238 #define DROPBEAR_CLI_PUBKEY_AUTH 1
239 239
240 /* A default argument for dbclient -i <privatekey>. 240 /* A default argument for dbclient -i <privatekey>.
241 * Homedir is prepended if path begins with ~ 241 * Homedir is prepended if path begins with ~/
242 */ 242 */
243 #define DROPBEAR_DEFAULT_CLI_AUTHKEY "~/.ssh/id_dropbear" 243 #define DROPBEAR_DEFAULT_CLI_AUTHKEY "~/.ssh/id_dropbear"
244 244
245 /* Allow specifying the password for dbclient via the DROPBEAR_PASSWORD 245 /* Allow specifying the password for dbclient via the DROPBEAR_PASSWORD
246 * environment variable. */ 246 * environment variable. */
281 service by setting this */ 281 service by setting this */
282 #define UNAUTH_CLOSE_DELAY 0 282 #define UNAUTH_CLOSE_DELAY 0
283 283
284 /* The default file to store the daemon's process ID, for shutdown 284 /* The default file to store the daemon's process ID, for shutdown
285 * scripts etc. This can be overridden with the -P flag. 285 * scripts etc. This can be overridden with the -P flag.
286 * Homedir is prepended if path begins with ~ 286 * Homedir is prepended if path begins with ~/
287 */ 287 */
288 #define DROPBEAR_PIDFILE "/var/run/dropbear.pid" 288 #define DROPBEAR_PIDFILE "/var/run/dropbear.pid"
289 289
290 /* The command to invoke for xauth when using X11 forwarding. 290 /* The command to invoke for xauth when using X11 forwarding.
291 * "-q" for quiet */ 291 * "-q" for quiet */
293 293
294 294
295 /* If you want to enable running an sftp server (such as the one included with 295 /* If you want to enable running an sftp server (such as the one included with
296 * OpenSSH), set the path below and set DROPBEAR_SFTPSERVER. 296 * OpenSSH), set the path below and set DROPBEAR_SFTPSERVER.
297 * The sftp-server program is not provided by Dropbear itself. 297 * The sftp-server program is not provided by Dropbear itself.
298 * Homedir is prepended if path begins with ~ 298 * Homedir is prepended if path begins with ~/
299 */ 299 */
300 #define DROPBEAR_SFTPSERVER 1 300 #define DROPBEAR_SFTPSERVER 1
301 #define SFTPSERVER_PATH "/usr/libexec/sftp-server" 301 #define SFTPSERVER_PATH "/usr/libexec/sftp-server"
302 302
303 /* This is used by the scp binary when used as a client binary. If you're 303 /* This is used by the scp binary when used as a client binary. If you're