[SCM] Samba Shared Repository - branch master updated
Ralph Böhme
slow at samba.org
Tue Oct 17 16:54:02 UTC 2017
The branch, master has been updated
via f6d6af3 vfs_catia: Fix a potential memleak
via e77b7af vfs_catia: Fix a memory leak
via de0d9ec vfs_catia: Make "srt_head" static to the module
via 11660b03 Update .ycm_extra_conf.py
from a3cc2fe s3/smbd: use correct access in get_file_handle_for_metadata
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit f6d6af3b2d5efcd160c1e5e09778fb1129530be0
Author: Volker Lendecke <vl at samba.org>
Date: Mon Oct 16 17:43:09 2017 +0200
vfs_catia: Fix a potential memleak
Together with the previous commit this fixes a memleak (twice) that
happens when vfs_catia is loaded with no mappings defined.
Bug: https://bugzilla.samba.org/show_bug.cgi?id=13090
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
Autobuild-User(master): Ralph Böhme <slow at samba.org>
Autobuild-Date(master): Tue Oct 17 18:53:48 CEST 2017 on sn-devel-144
commit e77b7aff86ab1cb603f59961f2f5689e4dc770ea
Author: Volker Lendecke <vl at samba.org>
Date: Tue Oct 17 11:28:36 2017 +0200
vfs_catia: Fix a memory leak
Bug: https://bugzilla.samba.org/show_bug.cgi?id=13090
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit de0d9ec41a191cc9119cd6581d9b3d1f03340e7c
Author: Volker Lendecke <vl at samba.org>
Date: Tue Oct 17 11:20:20 2017 +0200
vfs_catia: Make "srt_head" static to the module
Signed-off-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
commit 11660b03d6c183fd8e1d60b4d41b161a31228888
Author: Ralph Boehme <slow at samba.org>
Date: Tue Oct 17 13:13:53 2017 +0200
Update .ycm_extra_conf.py
The previous commit removed many includes. Why? This commit adds back
includes generated by running the latest YCM-Generator/config_gen.py.
Signed-off-by: Ralph Boehme <slow at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
-----------------------------------------------------------------------
Summary of changes:
.ycm_extra_conf.py | 132 ++++++++++++++++++++++++++++++++++++++++++++
source3/modules/vfs_catia.c | 5 +-
2 files changed, 135 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/.ycm_extra_conf.py b/.ycm_extra_conf.py
index 580669b..c96b59e 100644
--- a/.ycm_extra_conf.py
+++ b/.ycm_extra_conf.py
@@ -49,27 +49,159 @@ flags = [
'-DHAVE_IPV6=1',
'-I/usr/local/include',
'-I.',
+ '-Iauth',
+ '-Iauth/credentials',
+ '-Iauth/gensec',
+ '-Iauth/kerberos',
+ '-Iauth/ntlmssp',
+ '-Ictdb',
+ '-Ictdb/include',
+ '-Idynconfig',
'-Iinclude',
'-Iinclude/public',
'-Ilib',
+ '-Ilib/addns',
+ '-Ilib/afs',
+ '-Ilib/async_req',
+ '-Ilib/compression',
+ '-Ilib/crypto',
+ '-Ilib/dbwrap',
+ '-Ilib/krb5_wrap',
+ '-Ilib/ldb',
+ '-Ilib/ldb-samba',
+ '-Ilib/ldb/include',
+ '-Ilib/param',
+ '-Ilib/pthreadpool',
'-Ilib/replace',
+ '-Ilib/smbconf',
+ '-Ilib/socket',
+ '-Ilib/talloc',
+ '-Ilib/tdb',
+ '-Ilib/tdb/include',
+ '-Ilib/tevent',
+ '-Ilib/tsocket',
+ '-Ilib/util/charset',
+ '-Ilibcli/auth',
+ '-Ilibcli/cldap',
+ '-Ilibcli/drsuapi',
+ '-Ilibcli/ldap',
+ '-Ilibcli/lsarpc',
+ '-Ilibcli/named_pipe_auth',
+ '-Ilibcli/nbt',
+ '-Ilibcli/netlogon',
+ '-Ilibcli/registry',
+ '-Ilibcli/security',
+ '-Ilibcli/smb',
+ '-Ilibcli/util',
+ '-Ilibds/common',
+ '-Ilibrpc',
+ '-Insswitch',
+ '-Insswitch/libwbclient',
'-Isource3',
+ '-Isource3/auth',
'-Isource3/include',
'-Isource3/lib',
+ '-Isource3/librpc',
+ '-Isource3/modules',
+ '-Isource3/param',
+ '-Isource3/rpc_server',
+ '-Isource3/smbd/notifyd',
'-Isource4',
+ '-Isource4/auth',
+ '-Isource4/auth/gensec',
+ '-Isource4/auth/kerberos',
+ '-Isource4/cluster',
+ '-Isource4/dsdb',
'-Isource4/include',
'-Isource4/lib',
+ '-Isource4/lib/events',
+ '-Isource4/lib/http',
+ '-Isource4/lib/messaging',
+ '-Isource4/lib/socket',
+ '-Isource4/lib/stream',
+ '-Isource4/lib/tls',
+ '-Isource4/libcli',
+ '-Isource4/libcli/ldap',
+ '-Isource4/librpc',
+ '-Isource4/param',
+ '-Ithird_party/zlib',
'-Ibin/default',
+ '-Ibin/default/auth',
+ '-Ibin/default/auth/credentials',
+ '-Ibin/default/auth/gensec',
+ '-Ibin/default/auth/kerberos',
+ '-Ibin/default/auth/ntlmssp',
+ '-Ibin/default/ctdb',
+ '-Ibin/default/ctdb/include',
+ '-Ibin/default/dynconfig',
'-Ibin/default/include',
'-Ibin/default/include/public',
'-Ibin/default/lib',
+ '-Ibin/default/lib/addns',
+ '-Ibin/default/lib/afs',
+ '-Ibin/default/lib/async_req',
+ '-Ibin/default/lib/compression',
+ '-Ibin/default/lib/crypto',
+ '-Ibin/default/lib/dbwrap',
+ '-Ibin/default/lib/krb5_wrap',
+ '-Ibin/default/lib/ldb',
+ '-Ibin/default/lib/ldb-samba',
+ '-Ibin/default/lib/ldb/include',
+ '-Ibin/default/lib/param',
+ '-Ibin/default/lib/pthreadpool',
'-Ibin/default/lib/replace',
+ '-Ibin/default/lib/smbconf',
+ '-Ibin/default/lib/socket',
+ '-Ibin/default/lib/talloc',
+ '-Ibin/default/lib/tdb',
+ '-Ibin/default/lib/tdb/include',
+ '-Ibin/default/lib/tevent',
+ '-Ibin/default/lib/tsocket',
+ '-Ibin/default/lib/util/charset',
+ '-Ibin/default/libcli/auth',
+ '-Ibin/default/libcli/cldap',
+ '-Ibin/default/libcli/drsuapi',
+ '-Ibin/default/libcli/ldap',
+ '-Ibin/default/libcli/lsarpc',
+ '-Ibin/default/libcli/named_pipe_auth',
+ '-Ibin/default/libcli/nbt',
+ '-Ibin/default/libcli/netlogon',
+ '-Ibin/default/libcli/registry',
+ '-Ibin/default/libcli/security',
+ '-Ibin/default/libcli/smb',
+ '-Ibin/default/libcli/util',
+ '-Ibin/default/libds/common',
+ '-Ibin/default/librpc',
+ '-Ibin/default/nsswitch',
+ '-Ibin/default/nsswitch/libwbclient',
'-Ibin/default/source3',
+ '-Ibin/default/source3/auth',
'-Ibin/default/source3/include',
'-Ibin/default/source3/lib',
+ '-Ibin/default/source3/librpc',
+ '-Ibin/default/source3/modules',
+ '-Ibin/default/source3/param',
+ '-Ibin/default/source3/rpc_server',
+ '-Ibin/default/source3/smbd/notifyd',
'-Ibin/default/source4',
+ '-Ibin/default/source4/auth',
+ '-Ibin/default/source4/auth/gensec',
+ '-Ibin/default/source4/auth/kerberos',
+ '-Ibin/default/source4/cluster',
+ '-Ibin/default/source4/dsdb',
'-Ibin/default/source4/include',
'-Ibin/default/source4/lib',
+ '-Ibin/default/source4/lib/events',
+ '-Ibin/default/source4/lib/http',
+ '-Ibin/default/source4/lib/messaging',
+ '-Ibin/default/source4/lib/socket',
+ '-Ibin/default/source4/lib/stream',
+ '-Ibin/default/source4/lib/tls',
+ '-Ibin/default/source4/libcli',
+ '-Ibin/default/source4/libcli/ldap',
+ '-Ibin/default/source4/librpc',
+ '-Ibin/default/source4/param',
+ '-Ibin/default/third_party/zlib',
'-Wall',
'-Wcast-align',
'-Wcast-qual',
diff --git a/source3/modules/vfs_catia.c b/source3/modules/vfs_catia.c
index ce760ce..4088aff 100644
--- a/source3/modules/vfs_catia.c
+++ b/source3/modules/vfs_catia.c
@@ -53,7 +53,7 @@ struct catia_cache {
char *base_fname;
};
-struct share_mapping_entry *srt_head = NULL;
+static struct share_mapping_entry *srt_head = NULL;
static struct share_mapping_entry *get_srt(connection_struct *conn,
struct share_mapping_entry **global)
@@ -141,7 +141,7 @@ static NTSTATUS catia_string_replace_allocate(connection_struct *conn,
if (!init_mappings(conn, &selected)) {
/* No mappings found. Just use the old name */
- *mapped_name = talloc_strdup(NULL, name_in);
+ *mapped_name = talloc_strdup(talloc_tos(), name_in);
if (!*mapped_name) {
errno = ENOMEM;
return NT_STATUS_NO_MEMORY;
@@ -2406,6 +2406,7 @@ static NTSTATUS catia_readdir_attr(struct vfs_handle_struct *handle,
status = SMB_VFS_NEXT_READDIR_ATTR(handle, smb_fname, mem_ctx, pattr_data);
TALLOC_FREE(smb_fname);
+ TALLOC_FREE(fname);
return status;
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list