From 692f7a2cfec0eb8e96e682d536631034abea4d61 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Wed, 7 May 2025 21:01:49 +1000 Subject: [PATCH] Do not overwrite default download user when option is unset Commit 7ccf316c provided "root" (or the user name for UID 0) as a default download user. However, when DownloadUser is unset in pacman.conf, pacman was overwriting the default with null. Rectify this. Fixes #248 Signed-off-by: Allan McRae --- lib/libalpm/alpm.c | 2 +- src/pacman/conf.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/libalpm/alpm.c b/lib/libalpm/alpm.c index 36e6f7f4..60612fb2 100644 --- a/lib/libalpm/alpm.c +++ b/lib/libalpm/alpm.c @@ -85,7 +85,7 @@ alpm_handle_t SYMEXPORT *alpm_initialize(const char *root, const char *dbpath, /* set default sandboxuser */ ASSERT((pw = getpwuid(0)) != NULL, myerr = errno; goto cleanup); STRDUP(myhandle->sandboxuser, pw->pw_name, goto nomem); - + #ifdef ENABLE_NLS bindtextdomain("libalpm", LOCALEDIR); #endif diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 31a89fa8..a0e0e96a 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -938,7 +938,11 @@ static int setup_libalpm(void) alpm_option_set_architectures(handle, config->architectures); alpm_option_set_checkspace(handle, config->checkspace); alpm_option_set_usesyslog(handle, config->usesyslog); - alpm_option_set_sandboxuser(handle, config->sandboxuser); + + if(config->sandboxuser) { + alpm_option_set_sandboxuser(handle, config->sandboxuser); + } + alpm_option_set_disable_sandbox(handle, config->disable_sandbox); alpm_option_set_ignorepkgs(handle, config->ignorepkg);