The branch, master has been updated
via bdbb38d16c8 s3: libsmbclient: Fix smbc_getxattr() to return 0 on
success.
via 74636dfe24c s4: torture: Show return value for smbc_getxattr() is
incorrect (returns >0 for success, should return zero).
from ffc59fe0946 smbd: Correct store_smb2_posix_info size check
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit bdbb38d16c8eaff33484bb747efa639c4d8e7f35
Author: Jeremy Allison <j...@samba.org>
Date: Fri Oct 28 15:31:39 2022 -0700
s3: libsmbclient: Fix smbc_getxattr() to return 0 on success.
Remove knownfail.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14808
Signed-off-by: Jeremy Allison <j...@samba.org>
Reviewed-by: David Mulder <dmul...@samba.org>
Autobuild-User(master): Jeremy Allison <j...@samba.org>
Autobuild-Date(master): Tue Nov 1 18:31:22 UTC 2022 on sn-devel-184
commit 74636dfe24c15677261fc40c0a4ec62404898cf4
Author: Jeremy Allison <j...@samba.org>
Date: Fri Oct 28 15:28:41 2022 -0700
s4: torture: Show return value for smbc_getxattr() is incorrect (returns >0
for success, should return zero).
Add torture test to show smbc_getxattr() should return -1 on
failure, 0 on success.
Add knownfail.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14808
Signed-off-by: Jeremy Allison <j...@samba.org>
Reviewed-by: David Mulder <dmul...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
source3/libsmb/libsmb_xattr.c | 6 +-
source4/torture/libsmbclient/libsmbclient.c | 94 +++++++++++++++++++++++++++++
2 files changed, 99 insertions(+), 1 deletion(-)
Changeset truncated at 500 lines:
diff --git a/source3/libsmb/libsmb_xattr.c b/source3/libsmb/libsmb_xattr.c
index 58ee4965220..1e8d2718a22 100644
--- a/source3/libsmb/libsmb_xattr.c
+++ b/source3/libsmb/libsmb_xattr.c
@@ -2180,7 +2180,11 @@ SMBC_getxattr_ctx(SMBCCTX *context,
errno = SMBC_errno(context, srv->cli);
}
TALLOC_FREE(frame);
- return ret;
+ /*
+ * static function cacl_get returns a value greater than zero
+ * on success. Map this to zero meaning success.
+ */
+ return ret < 0 ? -1 : 0;
}
/* Unsupported attribute name */
diff --git a/source4/torture/libsmbclient/libsmbclient.c
b/source4/torture/libsmbclient/libsmbclient.c
index d335cad3a4e..55ea26f5bc8 100644
--- a/source4/torture/libsmbclient/libsmbclient.c
+++ b/source4/torture/libsmbclient/libsmbclient.c
@@ -1473,6 +1473,98 @@ static bool torture_libsmbclient_getatr(struct
torture_context *tctx)
return true;
}
+static bool torture_libsmbclient_getxattr(struct torture_context *tctx)
+{
+ const char *smburl = torture_setting_string(tctx, "smburl", NULL);
+ int fhandle = -1;
+ SMBCCTX *ctx = NULL;
+ char *getxattr_name = NULL;
+ char value[4096];
+ bool ok = false;
+ int ret = -1;
+
+ if (smburl == NULL) {
+ torture_fail(tctx,
+ "option --option=torture:smburl="
+ "smb://user:password@server missing\n");
+ }
+
+ ok = torture_libsmbclient_init_context(tctx, &ctx);
+ torture_assert(tctx, ok, "Failed to init context");
+ smbc_set_context(ctx);
+
+ getxattr_name = talloc_asprintf(tctx,
+ "%s/getxattr",
+ smburl);
+ if (getxattr_name == NULL) {
+ torture_result(tctx,
+ TORTURE_FAIL,
+ __location__": %s",
+ "talloc fail\n");
+ return false;
+ }
+ /* Ensure the file doesn't exist. */
+ smbc_unlink(getxattr_name);
+
+ /* Create testfile. */
+ fhandle = smbc_creat(getxattr_name, 0666);
+ if (fhandle < 0) {
+ torture_fail_goto(tctx,
+ done,
+ talloc_asprintf(tctx,
+ "failed to create file '%s': %s",
+ getxattr_name,
+ strerror(errno)));
+ }
+ ret = smbc_close(fhandle);
+ torture_assert_int_equal_goto(tctx,
+ ret,
+ 0,
+ ok,
+ done,
+ talloc_asprintf(tctx,
+ "failed to close handle for '%s'",
+ getxattr_name));
+
+ /*
+ * Ensure getting a non-existent attribute returns -1.
+ */
+ ret = smbc_getxattr(getxattr_name, "foobar", value, sizeof(value));
+ torture_assert_int_equal_goto(tctx,
+ ret,
+ -1,
+ ok,
+ done,
+ talloc_asprintf(tctx,
+ "smbc_getxattr(foobar) on '%s' should "
+ "get -1, got %d\n",
+ getxattr_name,
+ ret));
+
+ /*
+ * Ensure getting a valid attribute returns 0.
+ */
+ ret = smbc_getxattr(getxattr_name, "system.*", value, sizeof(value));
+ torture_assert_int_equal_goto(tctx,
+ ret,
+ 0,
+ ok,
+ done,
+ talloc_asprintf(tctx,
+ "smbc_getxattr(foobar) on '%s' should "
+ "get -1, got %d\n",
+ getxattr_name,
+ ret));
+
+ ok = true;
+
+ done:
+
+ smbc_unlink(getxattr_name);
+ smbc_free_context(ctx, 1);
+ return ok;
+}
+
NTSTATUS torture_libsmbclient_init(TALLOC_CTX *ctx)
{
struct torture_suite *suite;
@@ -1501,6 +1593,8 @@ NTSTATUS torture_libsmbclient_init(TALLOC_CTX *ctx)
torture_libsmbclient_rename);
torture_suite_add_simple_test(suite, "getatr",
torture_libsmbclient_getatr);
+ torture_suite_add_simple_test(suite, "getxattr",
+ torture_libsmbclient_getxattr);
suite->description = talloc_strdup(suite, "libsmbclient interface
tests");
--
Samba Shared Repository
