[PATCH] use const string for smbc_setWorkgroup and smbc_setNetbiosName
Andreas Schneider
asn at samba.org
Wed May 16 17:16:25 UTC 2018
On Wednesday, 16 May 2018 16:58:40 CEST David Disseldorp via samba-technical
wrote:
> Hi,
>
> This is a follow up to Andreas' earlier setUser change
> 9f3151a4e240480f2ed66115314b2f19a06967bf . Both setWorkgroup() and
> setNetbiosname() should also use const strings.
>
> Please review / push.
>
> Cheers, David
I've pushed the following patchset to master, which includes your workgroup
cleanup patch.
Andreas
--
Andreas Schneider GPG-ID: CC014E3D
Samba Team asn at samba.org
www.samba.org
-------------- next part --------------
>From ff4c8f46447352acac348b36bab7e994690fbff1 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn at samba.org>
Date: Wed, 16 May 2018 14:49:55 +0200
Subject: [PATCH 1/4] s3:libsmbclient: Use const for setting and getting
strings
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
---
source3/include/libsmbclient.h | 10 +-
source3/libsmb/ABI/smbclient-0.4.0.sigs | 184 ++++++++++++++++++++++++++++++++
source3/libsmb/libsmb_setget.c | 10 +-
source3/libsmb/wscript | 2 +-
4 files changed, 195 insertions(+), 11 deletions(-)
create mode 100644 source3/libsmb/ABI/smbclient-0.4.0.sigs
diff --git a/source3/include/libsmbclient.h b/source3/include/libsmbclient.h
index 426ed3cb6a1..ca5c7f87f71 100644
--- a/source3/include/libsmbclient.h
+++ b/source3/include/libsmbclient.h
@@ -537,22 +537,22 @@ int
smbc_setConfiguration(SMBCCTX *c, const char *file);
/** Get the netbios name used for making connections */
-char *
+const char *
smbc_getNetbiosName(SMBCCTX *c);
/** Set the netbios name used for making connections */
void
-smbc_setNetbiosName(SMBCCTX *c, char * netbios_name);
+smbc_setNetbiosName(SMBCCTX *c, const char *netbios_name);
/** Get the workgroup used for making connections */
-char *
+const char *
smbc_getWorkgroup(SMBCCTX *c);
/** Set the workgroup used for making connections */
-void smbc_setWorkgroup(SMBCCTX *c, char * workgroup);
+void smbc_setWorkgroup(SMBCCTX *c, const char *workgroup);
/** Get the username used for making connections */
-char *
+const char *
smbc_getUser(SMBCCTX *c);
/** Set the username used for making connections */
diff --git a/source3/libsmb/ABI/smbclient-0.4.0.sigs b/source3/libsmb/ABI/smbclient-0.4.0.sigs
new file mode 100644
index 00000000000..170cb52930d
--- /dev/null
+++ b/source3/libsmb/ABI/smbclient-0.4.0.sigs
@@ -0,0 +1,184 @@
+smbc_chmod: int (const char *, mode_t)
+smbc_close: int (int)
+smbc_closedir: int (int)
+smbc_creat: int (const char *, mode_t)
+smbc_fgetxattr: int (int, const char *, const void *, size_t)
+smbc_flistxattr: int (int, char *, size_t)
+smbc_free_context: int (SMBCCTX *, int)
+smbc_fremovexattr: int (int, const char *)
+smbc_fsetxattr: int (int, const char *, const void *, size_t, int)
+smbc_fstat: int (int, struct stat *)
+smbc_fstatvfs: int (int, struct statvfs *)
+smbc_ftruncate: int (int, off_t)
+smbc_getDebug: int (SMBCCTX *)
+smbc_getFunctionAddCachedServer: smbc_add_cached_srv_fn (SMBCCTX *)
+smbc_getFunctionAuthData: smbc_get_auth_data_fn (SMBCCTX *)
+smbc_getFunctionAuthDataWithContext: smbc_get_auth_data_with_context_fn (SMBCCTX *)
+smbc_getFunctionCheckServer: smbc_check_server_fn (SMBCCTX *)
+smbc_getFunctionChmod: smbc_chmod_fn (SMBCCTX *)
+smbc_getFunctionClose: smbc_close_fn (SMBCCTX *)
+smbc_getFunctionClosedir: smbc_closedir_fn (SMBCCTX *)
+smbc_getFunctionCreat: smbc_creat_fn (SMBCCTX *)
+smbc_getFunctionFstat: smbc_fstat_fn (SMBCCTX *)
+smbc_getFunctionFstatVFS: smbc_fstatvfs_fn (SMBCCTX *)
+smbc_getFunctionFstatdir: smbc_fstatdir_fn (SMBCCTX *)
+smbc_getFunctionFtruncate: smbc_ftruncate_fn (SMBCCTX *)
+smbc_getFunctionGetCachedServer: smbc_get_cached_srv_fn (SMBCCTX *)
+smbc_getFunctionGetdents: smbc_getdents_fn (SMBCCTX *)
+smbc_getFunctionGetxattr: smbc_getxattr_fn (SMBCCTX *)
+smbc_getFunctionListPrintJobs: smbc_list_print_jobs_fn (SMBCCTX *)
+smbc_getFunctionListxattr: smbc_listxattr_fn (SMBCCTX *)
+smbc_getFunctionLseek: smbc_lseek_fn (SMBCCTX *)
+smbc_getFunctionLseekdir: smbc_lseekdir_fn (SMBCCTX *)
+smbc_getFunctionMkdir: smbc_mkdir_fn (SMBCCTX *)
+smbc_getFunctionNotify: smbc_notify_fn (SMBCCTX *)
+smbc_getFunctionOpen: smbc_open_fn (SMBCCTX *)
+smbc_getFunctionOpenPrintJob: smbc_open_print_job_fn (SMBCCTX *)
+smbc_getFunctionOpendir: smbc_opendir_fn (SMBCCTX *)
+smbc_getFunctionPrintFile: smbc_print_file_fn (SMBCCTX *)
+smbc_getFunctionPurgeCachedServers: smbc_purge_cached_fn (SMBCCTX *)
+smbc_getFunctionRead: smbc_read_fn (SMBCCTX *)
+smbc_getFunctionReaddir: smbc_readdir_fn (SMBCCTX *)
+smbc_getFunctionReaddirPlus: smbc_readdirplus_fn (SMBCCTX *)
+smbc_getFunctionRemoveCachedServer: smbc_remove_cached_srv_fn (SMBCCTX *)
+smbc_getFunctionRemoveUnusedServer: smbc_remove_unused_server_fn (SMBCCTX *)
+smbc_getFunctionRemovexattr: smbc_removexattr_fn (SMBCCTX *)
+smbc_getFunctionRename: smbc_rename_fn (SMBCCTX *)
+smbc_getFunctionRmdir: smbc_rmdir_fn (SMBCCTX *)
+smbc_getFunctionSetxattr: smbc_setxattr_fn (SMBCCTX *)
+smbc_getFunctionSplice: smbc_splice_fn (SMBCCTX *)
+smbc_getFunctionStat: smbc_stat_fn (SMBCCTX *)
+smbc_getFunctionStatVFS: smbc_statvfs_fn (SMBCCTX *)
+smbc_getFunctionTelldir: smbc_telldir_fn (SMBCCTX *)
+smbc_getFunctionUnlink: smbc_unlink_fn (SMBCCTX *)
+smbc_getFunctionUnlinkPrintJob: smbc_unlink_print_job_fn (SMBCCTX *)
+smbc_getFunctionUtimes: smbc_utimes_fn (SMBCCTX *)
+smbc_getFunctionWrite: smbc_write_fn (SMBCCTX *)
+smbc_getNetbiosName: const char *(SMBCCTX *)
+smbc_getOptionBrowseMaxLmbCount: int (SMBCCTX *)
+smbc_getOptionCaseSensitive: smbc_bool (SMBCCTX *)
+smbc_getOptionDebugToStderr: smbc_bool (SMBCCTX *)
+smbc_getOptionFallbackAfterKerberos: smbc_bool (SMBCCTX *)
+smbc_getOptionFullTimeNames: smbc_bool (SMBCCTX *)
+smbc_getOptionNoAutoAnonymousLogin: smbc_bool (SMBCCTX *)
+smbc_getOptionOneSharePerServer: smbc_bool (SMBCCTX *)
+smbc_getOptionOpenShareMode: smbc_share_mode (SMBCCTX *)
+smbc_getOptionSmbEncryptionLevel: smbc_smb_encrypt_level (SMBCCTX *)
+smbc_getOptionUrlEncodeReaddirEntries: smbc_bool (SMBCCTX *)
+smbc_getOptionUseCCache: smbc_bool (SMBCCTX *)
+smbc_getOptionUseKerberos: smbc_bool (SMBCCTX *)
+smbc_getOptionUseNTHash: smbc_bool (SMBCCTX *)
+smbc_getOptionUserData: void *(SMBCCTX *)
+smbc_getPort: uint16_t (SMBCCTX *)
+smbc_getServerCacheData: struct smbc_server_cache *(SMBCCTX *)
+smbc_getTimeout: int (SMBCCTX *)
+smbc_getUser: const char *(SMBCCTX *)
+smbc_getWorkgroup: const char *(SMBCCTX *)
+smbc_getdents: int (unsigned int, struct smbc_dirent *, int)
+smbc_getxattr: int (const char *, const char *, const void *, size_t)
+smbc_init: int (smbc_get_auth_data_fn, int)
+smbc_init_context: SMBCCTX *(SMBCCTX *)
+smbc_lgetxattr: int (const char *, const char *, const void *, size_t)
+smbc_list_print_jobs: int (const char *, smbc_list_print_job_fn)
+smbc_listxattr: int (const char *, char *, size_t)
+smbc_llistxattr: int (const char *, char *, size_t)
+smbc_lremovexattr: int (const char *, const char *)
+smbc_lseek: off_t (int, off_t, int)
+smbc_lseekdir: int (int, off_t)
+smbc_lsetxattr: int (const char *, const char *, const void *, size_t, int)
+smbc_mkdir: int (const char *, mode_t)
+smbc_new_context: SMBCCTX *(void)
+smbc_notify: int (int, smbc_bool, uint32_t, unsigned int, smbc_notify_callback_fn, void *)
+smbc_open: int (const char *, int, mode_t)
+smbc_open_print_job: int (const char *)
+smbc_opendir: int (const char *)
+smbc_option_get: void *(SMBCCTX *, char *)
+smbc_option_set: void (SMBCCTX *, char *, ...)
+smbc_print_file: int (const char *, const char *)
+smbc_read: ssize_t (int, void *, size_t)
+smbc_readdir: struct smbc_dirent *(unsigned int)
+smbc_readdirplus: const struct libsmb_file_info *(unsigned int)
+smbc_removexattr: int (const char *, const char *)
+smbc_rename: int (const char *, const char *)
+smbc_rmdir: int (const char *)
+smbc_setConfiguration: int (SMBCCTX *, const char *)
+smbc_setDebug: void (SMBCCTX *, int)
+smbc_setFunctionAddCachedServer: void (SMBCCTX *, smbc_add_cached_srv_fn)
+smbc_setFunctionAuthData: void (SMBCCTX *, smbc_get_auth_data_fn)
+smbc_setFunctionAuthDataWithContext: void (SMBCCTX *, smbc_get_auth_data_with_context_fn)
+smbc_setFunctionCheckServer: void (SMBCCTX *, smbc_check_server_fn)
+smbc_setFunctionChmod: void (SMBCCTX *, smbc_chmod_fn)
+smbc_setFunctionClose: void (SMBCCTX *, smbc_close_fn)
+smbc_setFunctionClosedir: void (SMBCCTX *, smbc_closedir_fn)
+smbc_setFunctionCreat: void (SMBCCTX *, smbc_creat_fn)
+smbc_setFunctionFstat: void (SMBCCTX *, smbc_fstat_fn)
+smbc_setFunctionFstatVFS: void (SMBCCTX *, smbc_fstatvfs_fn)
+smbc_setFunctionFstatdir: void (SMBCCTX *, smbc_fstatdir_fn)
+smbc_setFunctionFtruncate: void (SMBCCTX *, smbc_ftruncate_fn)
+smbc_setFunctionGetCachedServer: void (SMBCCTX *, smbc_get_cached_srv_fn)
+smbc_setFunctionGetdents: void (SMBCCTX *, smbc_getdents_fn)
+smbc_setFunctionGetxattr: void (SMBCCTX *, smbc_getxattr_fn)
+smbc_setFunctionListPrintJobs: void (SMBCCTX *, smbc_list_print_jobs_fn)
+smbc_setFunctionListxattr: void (SMBCCTX *, smbc_listxattr_fn)
+smbc_setFunctionLseek: void (SMBCCTX *, smbc_lseek_fn)
+smbc_setFunctionLseekdir: void (SMBCCTX *, smbc_lseekdir_fn)
+smbc_setFunctionMkdir: void (SMBCCTX *, smbc_mkdir_fn)
+smbc_setFunctionNotify: void (SMBCCTX *, smbc_notify_fn)
+smbc_setFunctionOpen: void (SMBCCTX *, smbc_open_fn)
+smbc_setFunctionOpenPrintJob: void (SMBCCTX *, smbc_open_print_job_fn)
+smbc_setFunctionOpendir: void (SMBCCTX *, smbc_opendir_fn)
+smbc_setFunctionPrintFile: void (SMBCCTX *, smbc_print_file_fn)
+smbc_setFunctionPurgeCachedServers: void (SMBCCTX *, smbc_purge_cached_fn)
+smbc_setFunctionRead: void (SMBCCTX *, smbc_read_fn)
+smbc_setFunctionReaddir: void (SMBCCTX *, smbc_readdir_fn)
+smbc_setFunctionReaddirPlus: void (SMBCCTX *, smbc_readdirplus_fn)
+smbc_setFunctionRemoveCachedServer: void (SMBCCTX *, smbc_remove_cached_srv_fn)
+smbc_setFunctionRemoveUnusedServer: void (SMBCCTX *, smbc_remove_unused_server_fn)
+smbc_setFunctionRemovexattr: void (SMBCCTX *, smbc_removexattr_fn)
+smbc_setFunctionRename: void (SMBCCTX *, smbc_rename_fn)
+smbc_setFunctionRmdir: void (SMBCCTX *, smbc_rmdir_fn)
+smbc_setFunctionSetxattr: void (SMBCCTX *, smbc_setxattr_fn)
+smbc_setFunctionSplice: void (SMBCCTX *, smbc_splice_fn)
+smbc_setFunctionStat: void (SMBCCTX *, smbc_stat_fn)
+smbc_setFunctionStatVFS: void (SMBCCTX *, smbc_statvfs_fn)
+smbc_setFunctionTelldir: void (SMBCCTX *, smbc_telldir_fn)
+smbc_setFunctionUnlink: void (SMBCCTX *, smbc_unlink_fn)
+smbc_setFunctionUnlinkPrintJob: void (SMBCCTX *, smbc_unlink_print_job_fn)
+smbc_setFunctionUtimes: void (SMBCCTX *, smbc_utimes_fn)
+smbc_setFunctionWrite: void (SMBCCTX *, smbc_write_fn)
+smbc_setLogCallback: void (SMBCCTX *, void *, smbc_debug_callback_fn)
+smbc_setNetbiosName: void (SMBCCTX *, const char *)
+smbc_setOptionBrowseMaxLmbCount: void (SMBCCTX *, int)
+smbc_setOptionCaseSensitive: void (SMBCCTX *, smbc_bool)
+smbc_setOptionDebugToStderr: void (SMBCCTX *, smbc_bool)
+smbc_setOptionFallbackAfterKerberos: void (SMBCCTX *, smbc_bool)
+smbc_setOptionFullTimeNames: void (SMBCCTX *, smbc_bool)
+smbc_setOptionNoAutoAnonymousLogin: void (SMBCCTX *, smbc_bool)
+smbc_setOptionOneSharePerServer: void (SMBCCTX *, smbc_bool)
+smbc_setOptionOpenShareMode: void (SMBCCTX *, smbc_share_mode)
+smbc_setOptionSmbEncryptionLevel: void (SMBCCTX *, smbc_smb_encrypt_level)
+smbc_setOptionUrlEncodeReaddirEntries: void (SMBCCTX *, smbc_bool)
+smbc_setOptionUseCCache: void (SMBCCTX *, smbc_bool)
+smbc_setOptionUseKerberos: void (SMBCCTX *, smbc_bool)
+smbc_setOptionUseNTHash: void (SMBCCTX *, smbc_bool)
+smbc_setOptionUserData: void (SMBCCTX *, void *)
+smbc_setPort: void (SMBCCTX *, uint16_t)
+smbc_setServerCacheData: void (SMBCCTX *, struct smbc_server_cache *)
+smbc_setTimeout: void (SMBCCTX *, int)
+smbc_setUser: void (SMBCCTX *, const char *)
+smbc_setWorkgroup: void (SMBCCTX *, const char *)
+smbc_set_context: SMBCCTX *(SMBCCTX *)
+smbc_set_credentials: void (const char *, const char *, const char *, smbc_bool, const char *)
+smbc_set_credentials_with_fallback: void (SMBCCTX *, const char *, const char *, const char *)
+smbc_setxattr: int (const char *, const char *, const void *, size_t, int)
+smbc_stat: int (const char *, struct stat *)
+smbc_statvfs: int (char *, struct statvfs *)
+smbc_telldir: off_t (int)
+smbc_unlink: int (const char *)
+smbc_unlink_print_job: int (const char *, int)
+smbc_urldecode: int (char *, char *, size_t)
+smbc_urlencode: int (char *, char *, int)
+smbc_utime: int (const char *, struct utimbuf *)
+smbc_utimes: int (const char *, struct timeval *)
+smbc_version: const char *(void)
+smbc_write: ssize_t (int, const void *, size_t)
diff --git a/source3/libsmb/libsmb_setget.c b/source3/libsmb/libsmb_setget.c
index 7a17cadc891..60b822a395c 100644
--- a/source3/libsmb/libsmb_setget.c
+++ b/source3/libsmb/libsmb_setget.c
@@ -29,7 +29,7 @@
/** Get the netbios name used for making connections */
-char *
+const char *
smbc_getNetbiosName(SMBCCTX *c)
{
return c->netbios_name;
@@ -37,7 +37,7 @@ smbc_getNetbiosName(SMBCCTX *c)
/** Set the netbios name used for making connections */
void
-smbc_setNetbiosName(SMBCCTX *c, char * netbios_name)
+smbc_setNetbiosName(SMBCCTX *c, const char *netbios_name)
{
SAFE_FREE(c->netbios_name);
if (netbios_name) {
@@ -46,7 +46,7 @@ smbc_setNetbiosName(SMBCCTX *c, char * netbios_name)
}
/** Get the workgroup used for making connections */
-char *
+const char *
smbc_getWorkgroup(SMBCCTX *c)
{
return c->workgroup;
@@ -54,7 +54,7 @@ smbc_getWorkgroup(SMBCCTX *c)
/** Set the workgroup used for making connections */
void
-smbc_setWorkgroup(SMBCCTX *c, char * workgroup)
+smbc_setWorkgroup(SMBCCTX *c, const char *workgroup)
{
SAFE_FREE(c->workgroup);
if (workgroup) {
@@ -63,7 +63,7 @@ smbc_setWorkgroup(SMBCCTX *c, char * workgroup)
}
/** Get the username used for making connections */
-char *
+const char *
smbc_getUser(SMBCCTX *c)
{
return c->user;
diff --git a/source3/libsmb/wscript b/source3/libsmb/wscript
index 15575bcc6ab..5482aea7d9c 100644
--- a/source3/libsmb/wscript
+++ b/source3/libsmb/wscript
@@ -27,5 +27,5 @@ def build(bld):
public_headers='../include/libsmbclient.h',
abi_directory='ABI',
abi_match='smbc_*',
- vnum='0.3.3',
+ vnum='0.4.0',
pc_files='smbclient.pc')
--
2.16.3
>From bde558be900294bc7cb7ee4ffc3e90c0ac466670 Mon Sep 17 00:00:00 2001
From: David Disseldorp <ddiss at samba.org>
Date: Wed, 16 May 2018 16:50:55 +0200
Subject: [PATCH 2/4] s3:libsmbclient: cleanup smbc_setWorkgroup() usage
It now takes a const char *. There's no need to use heap memory here.
Signed-off-by: David Disseldorp <ddiss at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
---
source3/libsmb/libsmb_context.c | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/source3/libsmb/libsmb_context.c b/source3/libsmb/libsmb_context.c
index 932223c9b2f..9e7b083952f 100644
--- a/source3/libsmb/libsmb_context.c
+++ b/source3/libsmb/libsmb_context.c
@@ -659,24 +659,16 @@ smbc_init_context(SMBCCTX *context)
DEBUG(1, ("Using netbios name %s.\n", smbc_getNetbiosName(context)));
if (!smbc_getWorkgroup(context)) {
- char *workgroup;
+ const char *workgroup;
if (lp_workgroup()) {
- workgroup = SMB_STRDUP(lp_workgroup());
- }
- else {
+ workgroup = lp_workgroup();
+ } else {
/* TODO: Think about a decent default workgroup */
- workgroup = SMB_STRDUP("samba");
- }
-
- if (!workgroup) {
- TALLOC_FREE(frame);
- errno = ENOMEM;
- return NULL;
+ workgroup = "samba";
}
smbc_setWorkgroup(context, workgroup);
- SAFE_FREE(workgroup);
if (!smbc_getWorkgroup(context)) {
TALLOC_FREE(frame);
--
2.16.3
>From 25553aa68c91e8547cf7d3bf1344766c08633443 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn at samba.org>
Date: Wed, 16 May 2018 11:44:00 +0200
Subject: [PATCH 3/4] s4:torture: Do not leak memory in libsmbclient test
Found by Coverity.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
---
source4/torture/libsmbclient/libsmbclient.c | 205 ++++++++++++++++++++++------
1 file changed, 165 insertions(+), 40 deletions(-)
diff --git a/source4/torture/libsmbclient/libsmbclient.c b/source4/torture/libsmbclient/libsmbclient.c
index 91579f4b1b7..e84ce018a69 100644
--- a/source4/torture/libsmbclient/libsmbclient.c
+++ b/source4/torture/libsmbclient/libsmbclient.c
@@ -316,68 +316,193 @@ static bool torture_libsmbclient_readdirplus(struct torture_context *tctx)
return true;
}
-
-/* note the strdup for string options on smbc_set calls. I think libsmbclient is
- * really doing something wrong here: in smbc_free_context libsmbclient just
- * calls free() on the string options so it assumes the callers have malloced
- * them before setting them via smbc_set calls. */
-
-#define TEST_OPTION_INT(option, val) \
- torture_comment(tctx, "Testing smbc_set" #option "\n");\
- smbc_set ##option(ctx, val);\
- torture_comment(tctx, "Testing smbc_get" #option "\n");\
- torture_assert_int_equal(tctx, smbc_get ##option(ctx), val, "failed " #option);
-
-#define TEST_OPTION_STRING(option, val) \
- torture_comment(tctx, "Testing smbc_set" #option "\n");\
- smbc_set ##option(ctx, strdup(val));\
- torture_comment(tctx, "Testing smbc_get" #option "\n");\
- torture_assert_str_equal(tctx, smbc_get ##option(ctx), val, "failed " #option);
-
bool torture_libsmbclient_configuration(struct torture_context *tctx)
{
SMBCCTX *ctx;
+ bool ok = true;
ctx = smbc_new_context();
torture_assert(tctx, ctx, "failed to get new context");
torture_assert(tctx, smbc_init_context(ctx), "failed to init context");
- TEST_OPTION_INT(Debug, DEBUGLEVEL);
- TEST_OPTION_STRING(NetbiosName, "torture_netbios");
- TEST_OPTION_STRING(Workgroup, "torture_workgroup");
- TEST_OPTION_STRING(User, "torture_user");
- TEST_OPTION_INT(Timeout, 12345);
-
+ torture_comment(tctx, "Testing smbc_(set|get)Debug\n");
+ smbc_setDebug(ctx, DEBUGLEVEL);
+ torture_assert_int_equal_goto(tctx,
+ smbc_getDebug(ctx),
+ DEBUGLEVEL,
+ ok,
+ done,
+ "failed to set DEBUGLEVEL");
+
+ torture_comment(tctx, "Testing smbc_(set|get)NetbiosName\n");
+ smbc_setNetbiosName(ctx, discard_const("torture_netbios"));
+ torture_assert_str_equal_goto(tctx,
+ smbc_getNetbiosName(ctx),
+ "torture_netbios",
+ ok,
+ done,
+ "failed to set NetbiosName");
+
+ torture_comment(tctx, "Testing smbc_(set|get)Workgroup\n");
+ smbc_setWorkgroup(ctx, discard_const("torture_workgroup"));
+ torture_assert_str_equal_goto(tctx,
+ smbc_getWorkgroup(ctx),
+ "torture_workgroup",
+ ok,
+ done,
+ "failed to set Workgroup");
+
+ torture_comment(tctx, "Testing smbc_(set|get)User\n");
+ smbc_setUser(ctx, "torture_user");
+ torture_assert_str_equal_goto(tctx,
+ smbc_getUser(ctx),
+ "torture_user",
+ ok,
+ done,
+ "failed to set User");
+
+ torture_comment(tctx, "Testing smbc_(set|get)Timeout\n");
+ smbc_setTimeout(ctx, 12345);
+ torture_assert_int_equal_goto(tctx,
+ smbc_getTimeout(ctx),
+ 12345,
+ ok,
+ done,
+ "failed to set Timeout");
+
+done:
smbc_free_context(ctx, 1);
- return true;
+ return ok;
}
bool torture_libsmbclient_options(struct torture_context *tctx)
{
SMBCCTX *ctx;
+ bool ok = true;
ctx = smbc_new_context();
torture_assert(tctx, ctx, "failed to get new context");
torture_assert(tctx, smbc_init_context(ctx), "failed to init context");
- TEST_OPTION_INT(OptionDebugToStderr, true);
- TEST_OPTION_INT(OptionFullTimeNames, true);
- TEST_OPTION_INT(OptionOpenShareMode, SMBC_SHAREMODE_DENY_ALL);
- /* FIXME: OptionUserData */
- TEST_OPTION_INT(OptionSmbEncryptionLevel, SMBC_ENCRYPTLEVEL_REQUEST);
- TEST_OPTION_INT(OptionCaseSensitive, false);
- TEST_OPTION_INT(OptionBrowseMaxLmbCount, 2);
- TEST_OPTION_INT(OptionUrlEncodeReaddirEntries, true);
- TEST_OPTION_INT(OptionOneSharePerServer, true);
- TEST_OPTION_INT(OptionUseKerberos, false);
- TEST_OPTION_INT(OptionFallbackAfterKerberos, false);
- TEST_OPTION_INT(OptionNoAutoAnonymousLogin, true);
- TEST_OPTION_INT(OptionUseCCache, true);
-
+ torture_comment(tctx, "Testing smbc_(set|get)OptionDebugToStderr\n");
+ smbc_setOptionDebugToStderr(ctx, true);
+ torture_assert_goto(tctx,
+ smbc_getOptionDebugToStderr(ctx),
+ ok,
+ done,
+ "failed to set OptionDebugToStderr");
+
+ torture_comment(tctx, "Testing smbc_(set|get)OptionFullTimeNames\n");
+ smbc_setOptionFullTimeNames(ctx, true);
+ torture_assert_goto(tctx,
+ smbc_getOptionFullTimeNames(ctx),
+ ok,
+ done,
+ "failed to set OptionFullTimeNames");
+
+ torture_comment(tctx, "Testing smbc_(set|get)OptionOpenShareMode\n");
+ smbc_setOptionOpenShareMode(ctx, SMBC_SHAREMODE_DENY_ALL);
+ torture_assert_int_equal_goto(tctx,
+ smbc_getOptionOpenShareMode(ctx),
+ SMBC_SHAREMODE_DENY_ALL,
+ ok,
+ done,
+ "failed to set OptionOpenShareMode");
+
+ torture_comment(tctx, "Testing smbc_(set|get)OptionUserData\n");
+ smbc_setOptionUserData(ctx, (void *)discard_const("torture_user_data"));
+ torture_assert_str_equal_goto(tctx,
+ (const char*)smbc_getOptionUserData(ctx),
+ "torture_user_data",
+ ok,
+ done,
+ "failed to set OptionUserData");
+
+ torture_comment(tctx,
+ "Testing smbc_(set|get)OptionSmbEncryptionLevel\n");
+ smbc_setOptionSmbEncryptionLevel(ctx, SMBC_ENCRYPTLEVEL_REQUEST);
+ torture_assert_int_equal_goto(tctx,
+ smbc_getOptionSmbEncryptionLevel(ctx),
+ SMBC_ENCRYPTLEVEL_REQUEST,
+ ok,
+ done,
+ "failed to set OptionSmbEncryptionLevel");
+
+ torture_comment(tctx, "Testing smbc_(set|get)OptionCaseSensitive\n");
+ smbc_setOptionCaseSensitive(ctx, false);
+ torture_assert_goto(tctx,
+ !smbc_getOptionCaseSensitive(ctx),
+ ok,
+ done,
+ "failed to set OptionCaseSensitive");
+
+ torture_comment(tctx,
+ "Testing smbc_(set|get)OptionBrowseMaxLmbCount\n");
+ smbc_setOptionBrowseMaxLmbCount(ctx, 2);
+ torture_assert_int_equal_goto(tctx,
+ smbc_getOptionBrowseMaxLmbCount(ctx),
+ 2,
+ ok,
+ done,
+ "failed to set OptionBrowseMaxLmbCount");
+
+ torture_comment(tctx,
+ "Testing smbc_(set|get)OptionUrlEncodeReaddirEntries\n");
+ smbc_setOptionUrlEncodeReaddirEntries(ctx, true);
+ torture_assert_goto(tctx,
+ smbc_getOptionUrlEncodeReaddirEntries(ctx),
+ ok,
+ done,
+ "failed to set OptionUrlEncodeReaddirEntries");
+
+ torture_comment(tctx,
+ "Testing smbc_(set|get)OptionOneSharePerServer\n");
+ smbc_setOptionOneSharePerServer(ctx, true);
+ torture_assert_goto(tctx,
+ smbc_getOptionOneSharePerServer(ctx),
+ ok,
+ done,
+ "failed to set OptionOneSharePerServer");
+
+ torture_comment(tctx, "Testing smbc_(set|get)OptionUseKerberos\n");
+ smbc_setOptionUseKerberos(ctx, false);
+ torture_assert_goto(tctx,
+ !smbc_getOptionUseKerberos(ctx),
+ ok,
+ done,
+ "failed to set OptionUseKerberos");
+
+ torture_comment(tctx,
+ "Testing smbc_(set|get)OptionFallbackAfterKerberos\n");
+ smbc_setOptionFallbackAfterKerberos(ctx, false);
+ torture_assert_goto(tctx,
+ !smbc_getOptionFallbackAfterKerberos(ctx),
+ ok,
+ done,
+ "failed to set OptionFallbackAfterKerberos");
+
+ torture_comment(tctx,
+ "Testing smbc_(set|get)OptionNoAutoAnonymousLogin\n");
+ smbc_setOptionNoAutoAnonymousLogin(ctx, true);
+ torture_assert_goto(tctx,
+ smbc_getOptionNoAutoAnonymousLogin(ctx),
+ ok,
+ done,
+ "failed to set OptionNoAutoAnonymousLogin");
+
+ torture_comment(tctx, "Testing smbc_(set|get)OptionUseCCache\n");
+ smbc_setOptionUseCCache(ctx, true);
+ torture_assert_goto(tctx,
+ smbc_getOptionUseCCache(ctx),
+ ok,
+ done,
+ "failed to set OptionUseCCache");
+
+done:
smbc_free_context(ctx, 1);
- return true;
+ return ok;
}
NTSTATUS torture_libsmbclient_init(TALLOC_CTX *ctx)
--
2.16.3
>From 86d97a88aa444c3b2800d99c7c20816cad7bc062 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn at samba.org>
Date: Wed, 16 May 2018 11:46:22 +0200
Subject: [PATCH 4/4] s4:torture: Do not leak file descriptor in smb2 oplock
test
Found by Coverity.
Signed-off-by: Andreas Schneider <asn at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
---
source4/torture/smb2/oplock.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/source4/torture/smb2/oplock.c b/source4/torture/smb2/oplock.c
index cb1b5edddfe..9561f078c1a 100644
--- a/source4/torture/smb2/oplock.c
+++ b/source4/torture/smb2/oplock.c
@@ -4873,17 +4873,20 @@ static int do_child_process(int pipefd, const char *name)
ret = fcntl(fd, F_SETSIG, RT_SIGNAL_LEASE);
if (ret == -1) {
+ close(fd);
return 3;
}
ret = fcntl(fd, F_SETLEASE, F_WRLCK);
if (ret == -1) {
+ close(fd);
return 4;
}
/* Tell the parent we're ready. */
ret = sys_write(pipefd, &c, 1);
if (ret != 1) {
+ close(fd);
return 5;
}
@@ -4893,14 +4896,17 @@ static int do_child_process(int pipefd, const char *name)
/* Wait for RT_SIGNAL_LEASE or SIGALRM. */
ret = sigsuspend(&empty_set);
if (ret != -1 || errno != EINTR) {
+ close(fd);
return 6;
}
if (got_alarm == 1) {
+ close(fd);
return 10;
}
if (got_break != 1) {
+ close(fd);
return 7;
}
@@ -4913,6 +4919,7 @@ static int do_child_process(int pipefd, const char *name)
/* Remove our lease. */
ret = fcntl(fd, F_SETLEASE, F_UNLCK);
if (ret == -1) {
+ close(fd);
return 8;
}
--
2.16.3
More information about the samba-technical
mailing list