[SCM] Samba Shared Repository - branch master updated
Ralph Böhme
slow at samba.org
Wed Aug 25 17:10:02 UTC 2021
The branch, master has been updated
via 857045f3a23 s3: smbd: In create_conn_struct_cwd(), don't TALLOC_FREE() an unallocated pointer on error.
via b4d8c62c4e8 s3: mdssvc: Correctly disconnect the VFS connection inside the mds_ctx destructor.
from 6248eab5103 mangle_hash2: remove LOCK$ from list of reserved names
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 857045f3a236dea125200dd09279d677e513682b
Author: Jeremy Allison <jra at samba.org>
Date: Mon Aug 23 17:42:40 2021 -0700
s3: smbd: In create_conn_struct_cwd(), don't TALLOC_FREE() an unallocated pointer on error.
Just return the status - if create_conn_struct_as_root() fails
the connection struct never gets returned.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14809
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
Autobuild-User(master): Ralph Böhme <slow at samba.org>
Autobuild-Date(master): Wed Aug 25 17:09:23 UTC 2021 on sn-devel-184
commit b4d8c62c4e8191e05fd03dd096a0bc989e224ed3
Author: Jeremy Allison <jra at samba.org>
Date: Mon Aug 23 17:40:42 2021 -0700
s3: mdssvc: Correctly disconnect the VFS connection inside the mds_ctx destructor.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14809
Signed-off-by: Jeremy Allison <jra at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
-----------------------------------------------------------------------
Summary of changes:
source3/rpc_server/mdssvc/mdssvc.c | 5 +++++
source3/smbd/msdfs.c | 7 +------
2 files changed, 6 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_server/mdssvc/mdssvc.c b/source3/rpc_server/mdssvc/mdssvc.c
index d0e87dcf646..fa31b55a183 100644
--- a/source3/rpc_server/mdssvc/mdssvc.c
+++ b/source3/rpc_server/mdssvc/mdssvc.c
@@ -1569,6 +1569,11 @@ static int mds_ctx_destructor_cb(struct mds_ctx *mds_ctx)
}
TALLOC_FREE(mds_ctx->ino_path_map);
+ if (mds_ctx->conn != NULL) {
+ SMB_VFS_DISCONNECT(mds_ctx->conn);
+ conn_free(mds_ctx->conn);
+ }
+
ZERO_STRUCTP(mds_ctx);
return 0;
diff --git a/source3/smbd/msdfs.c b/source3/smbd/msdfs.c
index 45b6478985d..995ed815d90 100644
--- a/source3/smbd/msdfs.c
+++ b/source3/smbd/msdfs.c
@@ -525,12 +525,7 @@ NTSTATUS create_conn_struct_cwd(TALLOC_CTX *mem_ctx,
path,
session_info);
unbecome_root();
- if (!NT_STATUS_IS_OK(status)) {
- TALLOC_FREE(c);
- return status;
- }
-
- return NT_STATUS_OK;
+ return status;
}
static void shuffle_strlist(char **list, int count)
--
Samba Shared Repository
More information about the samba-cvs
mailing list