bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Check capabilities in SigLevel option parsing

Browse source 
Only allow turning it on if the backend library has support for it.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2011-09-21 12:59:04 -05:00
parent d36d70d294
commit 69694edd2c
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/pacman/conf.c
View file

@ -54,8 +54,10 @@ config_t *config_new(void)
newconfig->op = PM_OP_MAIN; newconfig->op = PM_OP_MAIN;
newconfig->logmask = ALPM_LOG_ERROR | ALPM_LOG_WARNING; newconfig->logmask = ALPM_LOG_ERROR | ALPM_LOG_WARNING;
newconfig->configfile = strdup(CONFFILE); newconfig->configfile = strdup(CONFFILE);
newconfig->siglevel = ALPM_SIG_PACKAGE | ALPM_SIG_PACKAGE_OPTIONAL | if(alpm_capabilities() & ALPM_CAPABILITY_SIGNATURES) {
ALPM_SIG_DATABASE | ALPM_SIG_DATABASE_OPTIONAL; newconfig->siglevel = ALPM_SIG_PACKAGE | ALPM_SIG_PACKAGE_OPTIONAL |
ALPM_SIG_DATABASE | ALPM_SIG_DATABASE_OPTIONAL;
}
return newconfig; return newconfig;
} }
@ -315,6 +317,13 @@ static int process_siglevel(alpm_list_t *values, alpm_siglevel_t *storage)
level &= ~ALPM_SIG_USE_DEFAULT; level &= ~ALPM_SIG_USE_DEFAULT;
} }
/* ensure we have sig checking ability and are actually turning it on */
if(!(alpm_capabilities() & ALPM_CAPABILITY_SIGNATURES) &&
level & (ALPM_SIG_PACKAGE | ALPM_SIG_DATABASE)) {
pm_printf(ALPM_LOG_ERROR, _("'SigLevel' option invalid, no signature support\n"));
ret = 1;
}
if(!ret) { if(!ret) {
*storage = level; *storage = level;
} }