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.

diff --git a/keyctl.c b/keyctl.c
index a2c3b340236622ecd868ab0dcfa535c151d8f402..4f98ec29b93c7ced064a78de22cbb46d1ae38b49 100644 (file)
--- a/keyctl.c
+++ b/keyctl.c
@@ -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:

diff --git a/tests/keyctl.c b/tests/keyctl.c
index 5d46ab78ea657596dd602ccd1b2af4ed6857f1ac..5d81b80207793738de5336e766727454f95cc2ab 100644 (file)
--- a/tests/keyctl.c
+++ b/tests/keyctl.c
@@ -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 */

diff --git a/xlat/key_reqkeys.in b/xlat/key_reqkeys.in
index 747e440b8fd0f94616949121bf64454eba274e96..ca60ca69f6cc2dbadc7d26cc0a48ca1c9af7fed2 100644 (file)
--- a/xlat/key_reqkeys.in
+++ b/xlat/key_reqkeys.in
@@ -1,3 +1,4 @@
+#val_type int
 KEY_REQKEY_DEFL_NO_CHANGE -1
 KEY_REQKEY_DEFL_DEFAULT 0
 KEY_REQKEY_DEFL_THREAD_KEYRING 1