From 0cd66fe6bd4ac2aa0b302ddf3eb5068fc9c522ec Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 4 Apr 2023 12:16:09 +0200 Subject: [PATCH] libsmb: Fix test for smbc_getxattr Bug: https://bugzilla.samba.org/show_bug.cgi?id=14808 Signed-off-by: Remi Collet Reviewed-by: Jeremy Allison Reviewed-by: Volker Lendecke Autobuild-User(master): Volker Lendecke Autobuild-Date(master): Sun Apr 9 10:44:38 UTC 2023 on atb-devel-224 --- source4/torture/libsmbclient/libsmbclient.c | 27 +++++++++++++++------ 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/source4/torture/libsmbclient/libsmbclient.c b/source4/torture/libsmbclient/libsmbclient.c index 55ea26f5bc8..72af8fc01c9 100644 --- a/source4/torture/libsmbclient/libsmbclient.c +++ b/source4/torture/libsmbclient/libsmbclient.c @@ -1542,17 +1542,30 @@ static bool torture_libsmbclient_getxattr(struct torture_context *tctx) ret)); /* - * Ensure getting a valid attribute returns 0. + * Ensure getting a valid attribute computes its size. */ - ret = smbc_getxattr(getxattr_name, "system.*", value, sizeof(value)); - torture_assert_int_equal_goto(tctx, - ret, - 0, + ret = smbc_getxattr(getxattr_name, "system.*", NULL, 0); + torture_assert_goto(tctx, + ret >= 0, ok, done, talloc_asprintf(tctx, - "smbc_getxattr(foobar) on '%s' should " - "get -1, got %d\n", + "smbc_getxattr(foobar, NULL) on '%s' should " + "get >=0, got %d\n", + getxattr_name, + ret)); + + /* + * Ensure getting a valid attribute returns its size. + */ + ret = smbc_getxattr(getxattr_name, "system.*", value, sizeof(value)); + torture_assert_goto(tctx, + ret >= 0, + ok, + done, + talloc_asprintf(tctx, + "smbc_getxattr(foobar, value) on '%s' should " + "get >=0, got %d\n", getxattr_name, ret));