keyctl: print KEYCTL_SET_REQKEY_KEYRING argument as an integer

* xlat/key_reqkeys.in: Add #val_type int.
* keyctl.c (SYS_FUNC(keyctl)) <case KEYCTL_SET_REQKEY_KEYRING>: Print
arg2 as an integer.
* tests/keyctl.c: Update expected output.
This commit is contained in:
Eugene Syromyatnikov 2018-05-21 03:46:48 +02:00 committed by Dmitry V. Levin
parent 4105c9fb5d
commit 22aa768c1d
3 changed files with 4 additions and 2 deletions

View File

@ -387,7 +387,8 @@ SYS_FUNC(keyctl)
break;
case KEYCTL_SET_REQKEY_KEYRING:
printxval(key_reqkeys, arg2, "KEY_REQKEY_DEFL_???");
printxvals_ex((int) arg2, "KEY_REQKEY_DEFL_???",
XLAT_STYLE_FMT_D, key_reqkeys, NULL);
break;
case KEYCTL_SET_TIMEOUT:

View File

@ -800,7 +800,7 @@ main(void)
do_keyctl(ARG_STR(KEYCTL_SET_REQKEY_KEYRING),
sizeof(kernel_ulong_t),
(kernel_ulong_t) 0xfeedf157badc0dedLLU,
"0xbadc0ded /* KEY_REQKEY_DEFL_??? */", NULL, 0UL);
"-1159983635 /* KEY_REQKEY_DEFL_??? */", NULL, 0UL);
/* KEYCTL_SET_TIMEOUT */

View File

@ -1,3 +1,4 @@
#val_type int
KEY_REQKEY_DEFL_NO_CHANGE -1
KEY_REQKEY_DEFL_DEFAULT 0
KEY_REQKEY_DEFL_THREAD_KEYRING 1