The branch, master has been updated via 8b4c6fb7c84 smbclient: Remove unused reference to extern override_logfile via 8d34b6735f8 lib: Make get_share_security_default static via ff40135a7cb s3:VFS: Remove function declaration for vfs_posixacl_init from 94808cc50e4 waf: Only use gnutls_aead_cipher_encryptv2() for GnuTLS > 3.6.14
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 8b4c6fb7c84e12498a799d155ef6dd439c3fc222 Author: Christof Schmitt <c...@samba.org> Date: Fri Sep 11 10:22:10 2020 -0700 smbclient: Remove unused reference to extern override_logfile Signed-off-by: Christof Schmitt <c...@samba.org> Reviewed-by: Volker Lendecke <v...@samba.org> Autobuild-User(master): Volker Lendecke <v...@samba.org> Autobuild-Date(master): Sat Sep 12 07:53:56 UTC 2020 on sn-devel-184 commit 8d34b6735f81cc21a1f6c364bd2c2804ff77d67c Author: Christof Schmitt <c...@samba.org> Date: Fri Sep 11 10:19:15 2020 -0700 lib: Make get_share_security_default static Reviewed-by: Christof Schmitt <c...@samba.org> Reviewed-by: Volker Lendecke <v...@samba.org> commit ff40135a7cbc39a26436a6c35a6b3f32d912e555 Author: Christof Schmitt <c...@samba.org> Date: Wed Aug 19 15:43:44 2020 -0700 s3:VFS: Remove function declaration for vfs_posixacl_init Signed-off-by: Christof Schmitt <c...@samba.org> Reviewed-by: Volker Lendecke <v...@samba.org> ----------------------------------------------------------------------- Summary of changes: source3/client/client.c | 2 -- source3/include/proto.h | 1 - source3/lib/sharesec.c | 4 +++- source3/modules/vfs_posixacl.h | 2 -- 4 files changed, 3 insertions(+), 6 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/client/client.c b/source3/client/client.c index 3d467498920..4b3ac1955e6 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -48,8 +48,6 @@ extern int do_smb_browse(void); /* mDNS browsing */ -extern bool override_logfile; - static int port = 0; static char *service; static char *desthost; diff --git a/source3/include/proto.h b/source3/include/proto.h index 3641849fbe1..b91fd8bcad4 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -143,7 +143,6 @@ struct named_mutex *grab_named_mutex(TALLOC_CTX *mem_ctx, const char *name, /* The following definitions come from lib/sharesec.c */ NTSTATUS share_info_db_init(void); -struct security_descriptor *get_share_security_default( TALLOC_CTX *ctx, size_t *psize, uint32_t def_access); struct security_descriptor *get_share_security( TALLOC_CTX *ctx, const char *servicename, size_t *psize); NTSTATUS set_share_security(const char *share_name, diff --git a/source3/lib/sharesec.c b/source3/lib/sharesec.c index acbdd8b5df9..fbb2d4795fa 100644 --- a/source3/lib/sharesec.c +++ b/source3/lib/sharesec.c @@ -267,7 +267,9 @@ NTSTATUS share_info_db_init(void) def_access is a GENERIC_XXX access mode. ********************************************************************/ -struct security_descriptor *get_share_security_default( TALLOC_CTX *ctx, size_t *psize, uint32_t def_access) +static struct security_descriptor *get_share_security_default(TALLOC_CTX *ctx, + size_t *psize, + uint32_t def_access) { uint32_t sa; struct security_ace ace; diff --git a/source3/modules/vfs_posixacl.h b/source3/modules/vfs_posixacl.h index 9cd3160f345..da7449f039c 100644 --- a/source3/modules/vfs_posixacl.h +++ b/source3/modules/vfs_posixacl.h @@ -42,7 +42,5 @@ int posixacl_sys_acl_set_fd(vfs_handle_struct *handle, int posixacl_sys_acl_delete_def_file(vfs_handle_struct *handle, const struct smb_filename *smb_fname); -NTSTATUS vfs_posixacl_init(TALLOC_CTX *); - #endif -- Samba Shared Repository