From: Amitay Isaacs <amitay@gmail.com>
Date: Wed, 29 Feb 2012 05:05:53 +0000 (+1100)
Subject: testsuite: Replace deprecated bzero with memset
X-Git-Tag: samba-4.0.0alpha19~668
X-Git-Url: http://git.samba.org/samba.git/?p=samba.git;a=commitdiff_plain;h=cac9bfe475790c8d682e30fd2648099dc3e72fa5

testsuite: Replace deprecated bzero with memset

This fixes build issues on solaris reported in bug #8767.

  https://bugzilla.samba.org/show_bug.cgi?id=8767

Autobuild-User: Amitay Isaacs <amitay@samba.org>
Autobuild-Date: Wed Feb 29 10:39:10 CET 2012 on sn-devel-104
---

diff --git a/testsuite/libsmbclient/src/chmod/chmod_1.c b/testsuite/libsmbclient/src/chmod/chmod_1.c
index 3d46ba2a8b0..4a317c073bb 100644
--- a/testsuite/libsmbclient/src/chmod/chmod_1.c
+++ b/testsuite/libsmbclient/src/chmod/chmod_1.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int fd = 0; 
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/chown/chown_1.c b/testsuite/libsmbclient/src/chown/chown_1.c
index 3d46ba2a8b0..4a317c073bb 100644
--- a/testsuite/libsmbclient/src/chown/chown_1.c
+++ b/testsuite/libsmbclient/src/chown/chown_1.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int fd = 0; 
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/close/close_1.c b/testsuite/libsmbclient/src/close/close_1.c
index 182964c9d20..6b60e59dba5 100644
--- a/testsuite/libsmbclient/src/close/close_1.c
+++ b/testsuite/libsmbclient/src/close/close_1.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int fd = 0; 
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/close/close_2.c b/testsuite/libsmbclient/src/close/close_2.c
index 41824e9d0fb..bd31ab11fd8 100644
--- a/testsuite/libsmbclient/src/close/close_2.c
+++ b/testsuite/libsmbclient/src/close/close_2.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int fd = 0; 
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/closedir/closedir_1.c b/testsuite/libsmbclient/src/closedir/closedir_1.c
index 0485bc22bec..c8092d70676 100644
--- a/testsuite/libsmbclient/src/closedir/closedir_1.c
+++ b/testsuite/libsmbclient/src/closedir/closedir_1.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int dh = 0; 
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/closedir/closedir_2.c b/testsuite/libsmbclient/src/closedir/closedir_2.c
index cb60cf67728..25e14367f56 100644
--- a/testsuite/libsmbclient/src/closedir/closedir_2.c
+++ b/testsuite/libsmbclient/src/closedir/closedir_2.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int dh = 0; 
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/closedir/closedir_3.c b/testsuite/libsmbclient/src/closedir/closedir_3.c
index 601a0180095..7cdbb94b57f 100644
--- a/testsuite/libsmbclient/src/closedir/closedir_3.c
+++ b/testsuite/libsmbclient/src/closedir/closedir_3.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int dh = 0; 
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/closedir/closedir_4.c b/testsuite/libsmbclient/src/closedir/closedir_4.c
index ffb5c0e80f2..1cc859940dd 100644
--- a/testsuite/libsmbclient/src/closedir/closedir_4.c
+++ b/testsuite/libsmbclient/src/closedir/closedir_4.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int dh = 0; 
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/creat/creat_1.c b/testsuite/libsmbclient/src/creat/creat_1.c
index 1b22b6ef3a5..1134d457372 100644
--- a/testsuite/libsmbclient/src/creat/creat_1.c
+++ b/testsuite/libsmbclient/src/creat/creat_1.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int fd = 0; 
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/creat/creat_2.c b/testsuite/libsmbclient/src/creat/creat_2.c
index 6181449e76b..ac4934f679d 100644
--- a/testsuite/libsmbclient/src/creat/creat_2.c
+++ b/testsuite/libsmbclient/src/creat/creat_2.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int fd = 0; 
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/creat/creat_3.c b/testsuite/libsmbclient/src/creat/creat_3.c
index f88a8df5c2b..2d48eb547c3 100644
--- a/testsuite/libsmbclient/src/creat/creat_3.c
+++ b/testsuite/libsmbclient/src/creat/creat_3.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int fd = 0; 
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/fstat/fstat_1.c b/testsuite/libsmbclient/src/fstat/fstat_1.c
index 74d4d6fe76f..ff05c2d5435 100644
--- a/testsuite/libsmbclient/src/fstat/fstat_1.c
+++ b/testsuite/libsmbclient/src/fstat/fstat_1.c
@@ -33,7 +33,7 @@ int main(int argc, char** argv)
 	int fd = 0;
 	struct stat st;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 4 )
 	{
diff --git a/testsuite/libsmbclient/src/fstat/fstat_2.c b/testsuite/libsmbclient/src/fstat/fstat_2.c
index 3e27541a0a6..20d3d67c5f4 100644
--- a/testsuite/libsmbclient/src/fstat/fstat_2.c
+++ b/testsuite/libsmbclient/src/fstat/fstat_2.c
@@ -33,7 +33,7 @@ int main(int argc, char** argv)
 	int fd = 0;
 	struct stat st;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 4 )
 	{
diff --git a/testsuite/libsmbclient/src/fstat/fstat_3.c b/testsuite/libsmbclient/src/fstat/fstat_3.c
index 24118ad58be..e406ef62c95 100644
--- a/testsuite/libsmbclient/src/fstat/fstat_3.c
+++ b/testsuite/libsmbclient/src/fstat/fstat_3.c
@@ -34,8 +34,8 @@ int main(int argc, char** argv)
 	char url[MAX_BUFF_SIZE];
 	struct stat st;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/fstat/fstat_4.c b/testsuite/libsmbclient/src/fstat/fstat_4.c
index 24118ad58be..e406ef62c95 100644
--- a/testsuite/libsmbclient/src/fstat/fstat_4.c
+++ b/testsuite/libsmbclient/src/fstat/fstat_4.c
@@ -34,8 +34,8 @@ int main(int argc, char** argv)
 	char url[MAX_BUFF_SIZE];
 	struct stat st;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/fstat/fstat_5.c b/testsuite/libsmbclient/src/fstat/fstat_5.c
index add089d5573..b07e56538bb 100644
--- a/testsuite/libsmbclient/src/fstat/fstat_5.c
+++ b/testsuite/libsmbclient/src/fstat/fstat_5.c
@@ -36,8 +36,8 @@ int main(int argc, char** argv)
 	char* message;
 	struct stat st;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/fstat/fstat_6.c b/testsuite/libsmbclient/src/fstat/fstat_6.c
index d317568444b..73248d0c2bb 100644
--- a/testsuite/libsmbclient/src/fstat/fstat_6.c
+++ b/testsuite/libsmbclient/src/fstat/fstat_6.c
@@ -37,8 +37,8 @@ int main(int argc, char** argv)
 	char* message;
 	struct stat st;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/getdents/getdents_1.c b/testsuite/libsmbclient/src/getdents/getdents_1.c
index fbbd78dfd0c..aea6ad0dc8e 100644
--- a/testsuite/libsmbclient/src/getdents/getdents_1.c
+++ b/testsuite/libsmbclient/src/getdents/getdents_1.c
@@ -39,8 +39,8 @@ int main(int argc, char** argv)
 	char url[MAX_BUFF_SIZE];
 	char dirbuff[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/getdents/getdents_2.c b/testsuite/libsmbclient/src/getdents/getdents_2.c
index 6b8ddb09059..921486cd074 100644
--- a/testsuite/libsmbclient/src/getdents/getdents_2.c
+++ b/testsuite/libsmbclient/src/getdents/getdents_2.c
@@ -39,8 +39,8 @@ int main(int argc, char** argv)
 	char url[MAX_BUFF_SIZE];
 	char dirbuff[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/getdents/getdents_3.c b/testsuite/libsmbclient/src/getdents/getdents_3.c
index 2febd26f7aa..fefc75676c9 100644
--- a/testsuite/libsmbclient/src/getdents/getdents_3.c
+++ b/testsuite/libsmbclient/src/getdents/getdents_3.c
@@ -49,11 +49,11 @@ int main(int argc, char** argv)
 	char dir_url[MAX_BUFF_SIZE];
 	char dirbuff[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
-	bzero(file_url,MAX_BUFF_SIZE);
-	bzero(dir_url,MAX_BUFF_SIZE);
-	bzero(buff,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
+	memset(file_url, '\0', MAX_BUFF_SIZE);
+	memset(dir_url, '\0', MAX_BUFF_SIZE);
+	memset(buff, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
@@ -96,8 +96,8 @@ int main(int argc, char** argv)
 
 		err = 0;
 		i = 0;
-		bzero(buff,MAX_BUFF_SIZE);
-		bzero(tmp_file_ptr,MAX_BUFF_SIZE-9);
+		memset(buff, '\0', MAX_BUFF_SIZE);
+		memset(tmp_file_ptr, '\0', MAX_BUFF_SIZE-9);
 
 		while ( diramount > 0 )
 		{
diff --git a/testsuite/libsmbclient/src/getdents/getdents_4.c b/testsuite/libsmbclient/src/getdents/getdents_4.c
index 18be3c7521d..fb6b4a7f647 100644
--- a/testsuite/libsmbclient/src/getdents/getdents_4.c
+++ b/testsuite/libsmbclient/src/getdents/getdents_4.c
@@ -46,11 +46,11 @@ int main(int argc, char** argv)
 	char dir_url[MAX_BUFF_SIZE];
 	char dirbuff[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
-	bzero(file_url,MAX_BUFF_SIZE);
-	bzero(dir_url,MAX_BUFF_SIZE);
-	bzero(buff,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
+	memset(file_url, '\0', MAX_BUFF_SIZE);
+	memset(dir_url, '\0', MAX_BUFF_SIZE);
+	memset(buff, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/getdents/getdents_5.c b/testsuite/libsmbclient/src/getdents/getdents_5.c
index b641d7b859b..352a1440e47 100644
--- a/testsuite/libsmbclient/src/getdents/getdents_5.c
+++ b/testsuite/libsmbclient/src/getdents/getdents_5.c
@@ -46,11 +46,11 @@ int main(int argc, char** argv)
 	char dir_url[MAX_BUFF_SIZE];
 	char dirbuff[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
-	bzero(file_url,MAX_BUFF_SIZE);
-	bzero(dir_url,MAX_BUFF_SIZE);
-	bzero(buff,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
+	memset(file_url, '\0', MAX_BUFF_SIZE);
+	memset(dir_url, '\0', MAX_BUFF_SIZE);
+	memset(buff, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/init/init_3.c b/testsuite/libsmbclient/src/init/init_3.c
index fe56911c84f..fea009ae73f 100644
--- a/testsuite/libsmbclient/src/init/init_3.c
+++ b/testsuite/libsmbclient/src/init/init_3.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int err = -1;
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_1.c b/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_1.c
index ec55f2b5712..cf290100ca2 100644
--- a/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_1.c
+++ b/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_1.c
@@ -64,10 +64,10 @@ int main(int argc, char** argv)
 	int err = -1;
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
-	bzero(g_print_user,MAX_BUFF_SIZE);
-	bzero(g_print_name,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
+	memset(g_print_user, '\0', MAX_BUFF_SIZE);
+	memset(g_print_name, '\0', MAX_BUFF_SIZE);
 
 	g_print_id = 0;
 	g_print_priority = 0;
diff --git a/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_2.c b/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_2.c
index da899696cee..735f1230110 100644
--- a/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_2.c
+++ b/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_2.c
@@ -61,10 +61,10 @@ int main(int argc, char** argv)
 	int err = -1;
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
-	bzero(g_print_user,MAX_BUFF_SIZE);
-	bzero(g_print_name,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
+	memset(g_print_user, '\0', MAX_BUFF_SIZE);
+	memset(g_print_name, '\0', MAX_BUFF_SIZE);
 
 	g_print_id = 0;
 	g_print_priority = 0;
diff --git a/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_3.c b/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_3.c
index 8df52f8eeff..a3b1cd224a8 100644
--- a/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_3.c
+++ b/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_3.c
@@ -55,10 +55,10 @@ int main(int argc, char** argv)
 	char url[MAX_BUFF_SIZE];
 	char* message;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
-	bzero(g_print_user,MAX_BUFF_SIZE);
-	bzero(g_print_name,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
+	memset(g_print_user, '\0', MAX_BUFF_SIZE);
+	memset(g_print_name, '\0', MAX_BUFF_SIZE);
 
 	g_print_id = 0;
 	g_print_priority = 0;
diff --git a/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_4.c b/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_4.c
index e579b07f3cb..15012876939 100644
--- a/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_4.c
+++ b/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_4.c
@@ -55,10 +55,10 @@ int main(int argc, char** argv)
 	char url[MAX_BUFF_SIZE];
 	char* message;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
-	bzero(g_print_user,MAX_BUFF_SIZE);
-	bzero(g_print_name,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
+	memset(g_print_user, '\0', MAX_BUFF_SIZE);
+	memset(g_print_name, '\0', MAX_BUFF_SIZE);
 
 	g_print_id = 0;
 	g_print_priority = 0;
diff --git a/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_5.c b/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_5.c
index 21e95bb413b..774873699eb 100644
--- a/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_5.c
+++ b/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_5.c
@@ -61,10 +61,10 @@ int main(int argc, char** argv)
 	int err = -1;
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
-	bzero(g_print_user,MAX_BUFF_SIZE);
-	bzero(g_print_name,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
+	memset(g_print_user, '\0', MAX_BUFF_SIZE);
+	memset(g_print_name, '\0', MAX_BUFF_SIZE);
 
 	g_print_id = 0;
 	g_print_priority = 0;
diff --git a/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_6.c b/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_6.c
index 433e4d26dbe..00bbf4d3b99 100644
--- a/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_6.c
+++ b/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_6.c
@@ -60,10 +60,10 @@ int main(int argc, char** argv)
 	char * message;
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
-	bzero(g_print_user,MAX_BUFF_SIZE);
-	bzero(g_print_name,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
+	memset(g_print_user, '\0', MAX_BUFF_SIZE);
+	memset(g_print_name, '\0', MAX_BUFF_SIZE);
 
 	g_print_id = 0;
 	g_print_priority = 0;
diff --git a/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_7.c b/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_7.c
index fce46297771..e6ebf4cc203 100644
--- a/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_7.c
+++ b/testsuite/libsmbclient/src/list_print_jobs/list_print_jobs_7.c
@@ -55,10 +55,10 @@ int main(int argc, char** argv)
 	char url[MAX_BUFF_SIZE];
 	char* message;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
-	bzero(g_print_user,MAX_BUFF_SIZE);
-	bzero(g_print_name,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
+	memset(g_print_user, '\0', MAX_BUFF_SIZE);
+	memset(g_print_name, '\0', MAX_BUFF_SIZE);
 
 	g_print_id = 0;
 	g_print_priority = 0;
diff --git a/testsuite/libsmbclient/src/lseek/lseek_1.c b/testsuite/libsmbclient/src/lseek/lseek_1.c
index 2f4f8650495..b6a6a535b68 100644
--- a/testsuite/libsmbclient/src/lseek/lseek_1.c
+++ b/testsuite/libsmbclient/src/lseek/lseek_1.c
@@ -32,7 +32,7 @@ int main(int argc, char** argv)
 	int err = -1;
 	int fd = 0;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 4 )
 	{
diff --git a/testsuite/libsmbclient/src/lseek/lseek_2.c b/testsuite/libsmbclient/src/lseek/lseek_2.c
index b4f2eba36b9..e6179ebc9c1 100644
--- a/testsuite/libsmbclient/src/lseek/lseek_2.c
+++ b/testsuite/libsmbclient/src/lseek/lseek_2.c
@@ -32,7 +32,7 @@ int main(int argc, char** argv)
 	int err = -1;
 	int fd = 0;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 4 )
 	{
diff --git a/testsuite/libsmbclient/src/lseek/lseek_3.c b/testsuite/libsmbclient/src/lseek/lseek_3.c
index 158c4604f19..1d25337dc4b 100644
--- a/testsuite/libsmbclient/src/lseek/lseek_3.c
+++ b/testsuite/libsmbclient/src/lseek/lseek_3.c
@@ -35,8 +35,8 @@ int main(int argc, char** argv)
 	char url[MAX_BUFF_SIZE];
 	char* message;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/lseek/lseek_4.c b/testsuite/libsmbclient/src/lseek/lseek_4.c
index 158c4604f19..1d25337dc4b 100644
--- a/testsuite/libsmbclient/src/lseek/lseek_4.c
+++ b/testsuite/libsmbclient/src/lseek/lseek_4.c
@@ -35,8 +35,8 @@ int main(int argc, char** argv)
 	char url[MAX_BUFF_SIZE];
 	char* message;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/lseek/lseek_5.c b/testsuite/libsmbclient/src/lseek/lseek_5.c
index 66367044b39..dcd9e7dcc15 100644
--- a/testsuite/libsmbclient/src/lseek/lseek_5.c
+++ b/testsuite/libsmbclient/src/lseek/lseek_5.c
@@ -35,8 +35,8 @@ int main(int argc, char** argv)
 	char url[MAX_BUFF_SIZE];
 	char* message;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/lseek/lseek_6.c b/testsuite/libsmbclient/src/lseek/lseek_6.c
index 68c3bfc22dd..776742dece1 100644
--- a/testsuite/libsmbclient/src/lseek/lseek_6.c
+++ b/testsuite/libsmbclient/src/lseek/lseek_6.c
@@ -35,8 +35,8 @@ int main(int argc, char** argv)
 	char url[MAX_BUFF_SIZE];
 	char* message;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/lseek/lseek_7.c b/testsuite/libsmbclient/src/lseek/lseek_7.c
index 17f172bb7be..30cfa588052 100644
--- a/testsuite/libsmbclient/src/lseek/lseek_7.c
+++ b/testsuite/libsmbclient/src/lseek/lseek_7.c
@@ -35,8 +35,8 @@ int main(int argc, char** argv)
 	char url[MAX_BUFF_SIZE];
 	char* message;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/lseek/lseek_8.c b/testsuite/libsmbclient/src/lseek/lseek_8.c
index 2460a4c0679..d778dcb5786 100644
--- a/testsuite/libsmbclient/src/lseek/lseek_8.c
+++ b/testsuite/libsmbclient/src/lseek/lseek_8.c
@@ -35,8 +35,8 @@ int main(int argc, char** argv)
 	char url[MAX_BUFF_SIZE];
 	char* message;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/lseekdir/lseekdir_1.c b/testsuite/libsmbclient/src/lseekdir/lseekdir_1.c
index 0610c21757f..decf3471596 100644
--- a/testsuite/libsmbclient/src/lseekdir/lseekdir_1.c
+++ b/testsuite/libsmbclient/src/lseekdir/lseekdir_1.c
@@ -42,11 +42,11 @@ int main(int argc, char** argv)
 	char file_url[MAX_BUFF_SIZE];
 	char dir_url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
-	bzero(file_url,MAX_BUFF_SIZE);
-	bzero(dir_url,MAX_BUFF_SIZE);
-	bzero(buff,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
+	memset(file_url, '\0', MAX_BUFF_SIZE);
+	memset(dir_url, '\0', MAX_BUFF_SIZE);
+	memset(buff, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/lseekdir/lseekdir_2.c b/testsuite/libsmbclient/src/lseekdir/lseekdir_2.c
index 8cfae823562..2c3f4485303 100644
--- a/testsuite/libsmbclient/src/lseekdir/lseekdir_2.c
+++ b/testsuite/libsmbclient/src/lseekdir/lseekdir_2.c
@@ -42,11 +42,11 @@ int main(int argc, char** argv)
 	char file_url[MAX_BUFF_SIZE];
 	char dir_url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
-	bzero(file_url,MAX_BUFF_SIZE);
-	bzero(dir_url,MAX_BUFF_SIZE);
-	bzero(buff,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
+	memset(file_url, '\0', MAX_BUFF_SIZE);
+	memset(dir_url, '\0', MAX_BUFF_SIZE);
+	memset(buff, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/lseekdir/lseekdir_3.c b/testsuite/libsmbclient/src/lseekdir/lseekdir_3.c
index a133bb83a87..86cadc76a88 100644
--- a/testsuite/libsmbclient/src/lseekdir/lseekdir_3.c
+++ b/testsuite/libsmbclient/src/lseekdir/lseekdir_3.c
@@ -34,8 +34,8 @@ int main(int argc, char** argv)
 
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/lseekdir/lseekdir_4.c b/testsuite/libsmbclient/src/lseekdir/lseekdir_4.c
index 8a1745d659d..1a67b2071b4 100644
--- a/testsuite/libsmbclient/src/lseekdir/lseekdir_4.c
+++ b/testsuite/libsmbclient/src/lseekdir/lseekdir_4.c
@@ -34,8 +34,8 @@ int main(int argc, char** argv)
 
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/lseekdir/lseekdir_5.c b/testsuite/libsmbclient/src/lseekdir/lseekdir_5.c
index 12523645c66..a6bfd01cc9f 100644
--- a/testsuite/libsmbclient/src/lseekdir/lseekdir_5.c
+++ b/testsuite/libsmbclient/src/lseekdir/lseekdir_5.c
@@ -47,11 +47,11 @@ int main(int argc, char** argv)
 	char dir_url[MAX_BUFF_SIZE];
 	char dirbuff[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
-	bzero(file_url,MAX_BUFF_SIZE);
-	bzero(dir_url,MAX_BUFF_SIZE);
-	bzero(buff,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
+	memset(file_url, '\0', MAX_BUFF_SIZE);
+	memset(dir_url, '\0', MAX_BUFF_SIZE);
+	memset(buff, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/lseekdir/lseekdir_6.c b/testsuite/libsmbclient/src/lseekdir/lseekdir_6.c
index 94c5997c94d..50501d46e3d 100644
--- a/testsuite/libsmbclient/src/lseekdir/lseekdir_6.c
+++ b/testsuite/libsmbclient/src/lseekdir/lseekdir_6.c
@@ -48,11 +48,11 @@ int main(int argc, char** argv)
 	char dir_url[MAX_BUFF_SIZE];
 	char dirbuff[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
-	bzero(file_url,MAX_BUFF_SIZE);
-	bzero(dir_url,MAX_BUFF_SIZE);
-	bzero(buff,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
+	memset(file_url, '\0', MAX_BUFF_SIZE);
+	memset(dir_url, '\0', MAX_BUFF_SIZE);
+	memset(buff, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/mkdir/mkdir_1.c b/testsuite/libsmbclient/src/mkdir/mkdir_1.c
index 07e11cb9dcc..0c1dfe3ce92 100644
--- a/testsuite/libsmbclient/src/mkdir/mkdir_1.c
+++ b/testsuite/libsmbclient/src/mkdir/mkdir_1.c
@@ -31,8 +31,8 @@ int main(int argc, char** argv)
 	int err = -1;
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/mkdir/mkdir_2.c b/testsuite/libsmbclient/src/mkdir/mkdir_2.c
index 1acd68d2201..42fefa6734d 100644
--- a/testsuite/libsmbclient/src/mkdir/mkdir_2.c
+++ b/testsuite/libsmbclient/src/mkdir/mkdir_2.c
@@ -31,8 +31,8 @@ int main(int argc, char** argv)
 	int err = -1;
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/mkdir/mkdir_3.c b/testsuite/libsmbclient/src/mkdir/mkdir_3.c
index 272da51f89a..fa8038748b1 100644
--- a/testsuite/libsmbclient/src/mkdir/mkdir_3.c
+++ b/testsuite/libsmbclient/src/mkdir/mkdir_3.c
@@ -31,8 +31,8 @@ int main(int argc, char** argv)
 	int err = -1;
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/mkdir/mkdir_4.c b/testsuite/libsmbclient/src/mkdir/mkdir_4.c
index dcbd5949eb9..11cc51927a6 100644
--- a/testsuite/libsmbclient/src/mkdir/mkdir_4.c
+++ b/testsuite/libsmbclient/src/mkdir/mkdir_4.c
@@ -31,8 +31,8 @@ int main(int argc, char** argv)
 	int err = -1;
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/open/open_1.c b/testsuite/libsmbclient/src/open/open_1.c
index 7fb107244d1..676188c4f53 100644
--- a/testsuite/libsmbclient/src/open/open_1.c
+++ b/testsuite/libsmbclient/src/open/open_1.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int fd = 0; 
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/open/open_2.c b/testsuite/libsmbclient/src/open/open_2.c
index 471b498eb93..05f30e96dad 100644
--- a/testsuite/libsmbclient/src/open/open_2.c
+++ b/testsuite/libsmbclient/src/open/open_2.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int fd = 0; 
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/open/open_3.c b/testsuite/libsmbclient/src/open/open_3.c
index 348fe6f9119..df4af7be002 100644
--- a/testsuite/libsmbclient/src/open/open_3.c
+++ b/testsuite/libsmbclient/src/open/open_3.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int fd = 0; 
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/open/open_4.c b/testsuite/libsmbclient/src/open/open_4.c
index 4654e6721d9..feb87b8fb7f 100644
--- a/testsuite/libsmbclient/src/open/open_4.c
+++ b/testsuite/libsmbclient/src/open/open_4.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int fd = 0; 
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/open/open_5.c b/testsuite/libsmbclient/src/open/open_5.c
index 84e86e02927..44867f3a354 100644
--- a/testsuite/libsmbclient/src/open/open_5.c
+++ b/testsuite/libsmbclient/src/open/open_5.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int fd = 0; 
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/open_print_job/open_print_job_1.c b/testsuite/libsmbclient/src/open_print_job/open_print_job_1.c
index cda9326ef3a..d3c5d0002d2 100644
--- a/testsuite/libsmbclient/src/open_print_job/open_print_job_1.c
+++ b/testsuite/libsmbclient/src/open_print_job/open_print_job_1.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int fd = 0; 
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/open_print_job/open_print_job_2.c b/testsuite/libsmbclient/src/open_print_job/open_print_job_2.c
index 691fe2d0e18..1e7d0f18f01 100644
--- a/testsuite/libsmbclient/src/open_print_job/open_print_job_2.c
+++ b/testsuite/libsmbclient/src/open_print_job/open_print_job_2.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int fd = 0; 
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/opendir/opendir_1.c b/testsuite/libsmbclient/src/opendir/opendir_1.c
index 1495e92e74b..8d5a5ac67b4 100644
--- a/testsuite/libsmbclient/src/opendir/opendir_1.c
+++ b/testsuite/libsmbclient/src/opendir/opendir_1.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int dh = 0; 
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/opendir/opendir_2.c b/testsuite/libsmbclient/src/opendir/opendir_2.c
index f282f42b54a..c9ff2fc5356 100644
--- a/testsuite/libsmbclient/src/opendir/opendir_2.c
+++ b/testsuite/libsmbclient/src/opendir/opendir_2.c
@@ -31,8 +31,8 @@ int main(int argc, char** argv)
 	int err = -1;
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/opendir/opendir_3.c b/testsuite/libsmbclient/src/opendir/opendir_3.c
index db9e9e0aec2..149d8c04b01 100644
--- a/testsuite/libsmbclient/src/opendir/opendir_3.c
+++ b/testsuite/libsmbclient/src/opendir/opendir_3.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int fd = 0;
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/opendir/opendir_4.c b/testsuite/libsmbclient/src/opendir/opendir_4.c
index 819fca71a07..b298c09bbdf 100644
--- a/testsuite/libsmbclient/src/opendir/opendir_4.c
+++ b/testsuite/libsmbclient/src/opendir/opendir_4.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int fd = 0;
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/print_file/print_file_1.c b/testsuite/libsmbclient/src/print_file/print_file_1.c
index 7722c834530..9fb6d4e0daa 100644
--- a/testsuite/libsmbclient/src/print_file/print_file_1.c
+++ b/testsuite/libsmbclient/src/print_file/print_file_1.c
@@ -35,8 +35,8 @@ int main(int argc, char** argv)
 	char url[MAX_BUFF_SIZE];
 	char* message;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 7 )
 	{
diff --git a/testsuite/libsmbclient/src/print_file/print_file_2.c b/testsuite/libsmbclient/src/print_file/print_file_2.c
index 29336099e86..9b4e41a65bd 100644
--- a/testsuite/libsmbclient/src/print_file/print_file_2.c
+++ b/testsuite/libsmbclient/src/print_file/print_file_2.c
@@ -35,8 +35,8 @@ int main(int argc, char** argv)
 	char url[MAX_BUFF_SIZE];
 	char* message;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 7 )
 	{
diff --git a/testsuite/libsmbclient/src/print_file/print_file_3.c b/testsuite/libsmbclient/src/print_file/print_file_3.c
index fcd1f51e397..41de01c1cd7 100644
--- a/testsuite/libsmbclient/src/print_file/print_file_3.c
+++ b/testsuite/libsmbclient/src/print_file/print_file_3.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int err = -1;
 
 	char url[MAX_BUFF_SIZE];
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/print_file/print_file_4.c b/testsuite/libsmbclient/src/print_file/print_file_4.c
index 196697e4552..568c49f3489 100644
--- a/testsuite/libsmbclient/src/print_file/print_file_4.c
+++ b/testsuite/libsmbclient/src/print_file/print_file_4.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int err = -1;
 
 	char url[MAX_BUFF_SIZE];
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/read/read_1.c b/testsuite/libsmbclient/src/read/read_1.c
index 0862d2f4ac2..c708619cd87 100644
--- a/testsuite/libsmbclient/src/read/read_1.c
+++ b/testsuite/libsmbclient/src/read/read_1.c
@@ -36,8 +36,8 @@ int main(int argc, char** argv)
 	char* message;
 	char* response;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/read/read_10.c b/testsuite/libsmbclient/src/read/read_10.c
index 28653c56b86..883c3a6459c 100644
--- a/testsuite/libsmbclient/src/read/read_10.c
+++ b/testsuite/libsmbclient/src/read/read_10.c
@@ -35,8 +35,8 @@ int main(int argc, char** argv)
 	char url[MAX_BUFF_SIZE];
 	char* message = NULL;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/read/read_11.c b/testsuite/libsmbclient/src/read/read_11.c
index 413b35d5877..f0609134ec6 100644
--- a/testsuite/libsmbclient/src/read/read_11.c
+++ b/testsuite/libsmbclient/src/read/read_11.c
@@ -36,8 +36,8 @@ int main(int argc, char** argv)
 	char* message;
 	char* response;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/read/read_12.c b/testsuite/libsmbclient/src/read/read_12.c
index fb540cc5a5a..c4ae1ef8f1d 100644
--- a/testsuite/libsmbclient/src/read/read_12.c
+++ b/testsuite/libsmbclient/src/read/read_12.c
@@ -36,8 +36,8 @@ int main(int argc, char** argv)
 	char* message;
 	char* response;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/read/read_13.c b/testsuite/libsmbclient/src/read/read_13.c
index 9b90e006a5c..2dbbb887ae9 100644
--- a/testsuite/libsmbclient/src/read/read_13.c
+++ b/testsuite/libsmbclient/src/read/read_13.c
@@ -36,8 +36,8 @@ int main(int argc, char** argv)
 	char* message;
 	char* response;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/read/read_2.c b/testsuite/libsmbclient/src/read/read_2.c
index b2cc2766fb4..6eab5aff4f2 100644
--- a/testsuite/libsmbclient/src/read/read_2.c
+++ b/testsuite/libsmbclient/src/read/read_2.c
@@ -36,8 +36,8 @@ int main(int argc, char** argv)
 	char* message;
 	char* response;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/read/read_3.c b/testsuite/libsmbclient/src/read/read_3.c
index 8c252ba707a..5c05097fc21 100644
--- a/testsuite/libsmbclient/src/read/read_3.c
+++ b/testsuite/libsmbclient/src/read/read_3.c
@@ -36,8 +36,8 @@ int main(int argc, char** argv)
 	char* message;
 	char* response;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/read/read_4.c b/testsuite/libsmbclient/src/read/read_4.c
index bb78c6fe840..5620f43e446 100644
--- a/testsuite/libsmbclient/src/read/read_4.c
+++ b/testsuite/libsmbclient/src/read/read_4.c
@@ -36,8 +36,8 @@ int main(int argc, char** argv)
 	char* message;
 	char* response;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
@@ -50,7 +50,7 @@ int main(int argc, char** argv)
 		msg_len = strlen(argv[5])+1;
 		message = malloc(msg_len);
 		response = malloc(msg_len);
-		bzero(response,msg_len);
+		memset(response, '\0', msg_len);
 		message[msg_len - 1] = 0;	
 		strncpy(message,argv[5],msg_len);
 
diff --git a/testsuite/libsmbclient/src/read/read_5.c b/testsuite/libsmbclient/src/read/read_5.c
index 4cfca3a20fb..b9035b01718 100644
--- a/testsuite/libsmbclient/src/read/read_5.c
+++ b/testsuite/libsmbclient/src/read/read_5.c
@@ -36,8 +36,8 @@ int main(int argc, char** argv)
 	char* message;
 	char* response;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/read/read_6.c b/testsuite/libsmbclient/src/read/read_6.c
index 74ba22747be..25f4416ea4a 100644
--- a/testsuite/libsmbclient/src/read/read_6.c
+++ b/testsuite/libsmbclient/src/read/read_6.c
@@ -36,8 +36,8 @@ int main(int argc, char** argv)
 	char* message;
 	char* response;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
@@ -50,7 +50,7 @@ int main(int argc, char** argv)
 		msg_len = strlen(argv[5])+1;
 		message = malloc(msg_len);
 		response = malloc(msg_len);
-		bzero(response,msg_len);
+		memset(response, '\0', msg_len);
 		message[msg_len - 1] = 0;	
 		strncpy(message,argv[5],msg_len);
 
diff --git a/testsuite/libsmbclient/src/read/read_7.c b/testsuite/libsmbclient/src/read/read_7.c
index f229f8ecce1..4660c1e3b56 100644
--- a/testsuite/libsmbclient/src/read/read_7.c
+++ b/testsuite/libsmbclient/src/read/read_7.c
@@ -33,7 +33,7 @@ int main(int argc, char** argv)
 	int fd = 0;
 	char* message = "Testing";
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 4 )
 	{
diff --git a/testsuite/libsmbclient/src/read/read_8.c b/testsuite/libsmbclient/src/read/read_8.c
index db9db0daf6e..d70a78ec344 100644
--- a/testsuite/libsmbclient/src/read/read_8.c
+++ b/testsuite/libsmbclient/src/read/read_8.c
@@ -33,7 +33,7 @@ int main(int argc, char** argv)
 	int fd = 0;
 	char* message = "Testing";
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 4 )
 	{
diff --git a/testsuite/libsmbclient/src/read/read_9.c b/testsuite/libsmbclient/src/read/read_9.c
index 7273277ab54..dc848b179b7 100644
--- a/testsuite/libsmbclient/src/read/read_9.c
+++ b/testsuite/libsmbclient/src/read/read_9.c
@@ -35,8 +35,8 @@ int main(int argc, char** argv)
 	char url[MAX_BUFF_SIZE];
 	char* message = NULL;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/readdir/readdir_1.c b/testsuite/libsmbclient/src/readdir/readdir_1.c
index 7b508a0968f..fc0849ff3b4 100644
--- a/testsuite/libsmbclient/src/readdir/readdir_1.c
+++ b/testsuite/libsmbclient/src/readdir/readdir_1.c
@@ -46,11 +46,11 @@ int main(int argc, char** argv)
 	char dir_url[MAX_BUFF_SIZE];
 	char dirbuff[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
-	bzero(file_url,MAX_BUFF_SIZE);
-	bzero(dir_url,MAX_BUFF_SIZE);
-	bzero(buff,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
+	memset(file_url, '\0', MAX_BUFF_SIZE);
+	memset(dir_url, '\0', MAX_BUFF_SIZE);
+	memset(buff, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/readdir/readdir_2.c b/testsuite/libsmbclient/src/readdir/readdir_2.c
index dbc453701e8..5c7658952fb 100644
--- a/testsuite/libsmbclient/src/readdir/readdir_2.c
+++ b/testsuite/libsmbclient/src/readdir/readdir_2.c
@@ -46,11 +46,11 @@ int main(int argc, char** argv)
 	char dir_url[MAX_BUFF_SIZE];
 	char dirbuff[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
-	bzero(file_url,MAX_BUFF_SIZE);
-	bzero(dir_url,MAX_BUFF_SIZE);
-	bzero(buff,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
+	memset(file_url, '\0', MAX_BUFF_SIZE);
+	memset(dir_url, '\0', MAX_BUFF_SIZE);
+	memset(buff, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/readdir/readdir_3.c b/testsuite/libsmbclient/src/readdir/readdir_3.c
index 3030b9b1176..9854d73e593 100644
--- a/testsuite/libsmbclient/src/readdir/readdir_3.c
+++ b/testsuite/libsmbclient/src/readdir/readdir_3.c
@@ -38,8 +38,8 @@ int main(int argc, char** argv)
 	char url[MAX_BUFF_SIZE];
 	char dirbuff[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/readdir/readdir_4.c b/testsuite/libsmbclient/src/readdir/readdir_4.c
index 5d893b50dd8..b3c41515833 100644
--- a/testsuite/libsmbclient/src/readdir/readdir_4.c
+++ b/testsuite/libsmbclient/src/readdir/readdir_4.c
@@ -38,8 +38,8 @@ int main(int argc, char** argv)
 	char url[MAX_BUFF_SIZE];
 	char dirbuff[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/readdir/readdir_5.c b/testsuite/libsmbclient/src/readdir/readdir_5.c
index aa77c4027dd..e648dda60d8 100644
--- a/testsuite/libsmbclient/src/readdir/readdir_5.c
+++ b/testsuite/libsmbclient/src/readdir/readdir_5.c
@@ -47,11 +47,11 @@ int main(int argc, char** argv)
 	char dir_url[MAX_BUFF_SIZE];
 	char dirbuff[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
-	bzero(file_url,MAX_BUFF_SIZE);
-	bzero(dir_url,MAX_BUFF_SIZE);
-	bzero(buff,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
+	memset(file_url, '\0', MAX_BUFF_SIZE);
+	memset(dir_url, '\0', MAX_BUFF_SIZE);
+	memset(buff, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
@@ -93,8 +93,8 @@ int main(int argc, char** argv)
 
 		err = 0;
 		i = 0;
-		bzero(buff,MAX_BUFF_SIZE);
-		bzero(tmp_file_ptr,MAX_BUFF_SIZE-9);
+		memset(buff, '\0', MAX_BUFF_SIZE);
+		memset(tmp_file_ptr, '\0', MAX_BUFF_SIZE-9);
 
 		while ( 1 )
 		{
diff --git a/testsuite/libsmbclient/src/rename/rename_1.c b/testsuite/libsmbclient/src/rename/rename_1.c
index 707ccffcf67..d2650f96156 100644
--- a/testsuite/libsmbclient/src/rename/rename_1.c
+++ b/testsuite/libsmbclient/src/rename/rename_1.c
@@ -31,8 +31,8 @@ int main(int argc, char** argv)
 	int err = -1;
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/rename/rename_10.c b/testsuite/libsmbclient/src/rename/rename_10.c
index 3953cb1d395..42e5b551386 100644
--- a/testsuite/libsmbclient/src/rename/rename_10.c
+++ b/testsuite/libsmbclient/src/rename/rename_10.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int fd1 = 0;
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 9 )
 	{
diff --git a/testsuite/libsmbclient/src/rename/rename_11.c b/testsuite/libsmbclient/src/rename/rename_11.c
index 53411970617..e161fd35ec2 100644
--- a/testsuite/libsmbclient/src/rename/rename_11.c
+++ b/testsuite/libsmbclient/src/rename/rename_11.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int fd1 = 0;
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/rename/rename_12.c b/testsuite/libsmbclient/src/rename/rename_12.c
index a088f66c4d4..b4e80c897f6 100644
--- a/testsuite/libsmbclient/src/rename/rename_12.c
+++ b/testsuite/libsmbclient/src/rename/rename_12.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int fd1 = 0;
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/rename/rename_13.c b/testsuite/libsmbclient/src/rename/rename_13.c
index 073fbb6eaf2..46fa9e312fc 100644
--- a/testsuite/libsmbclient/src/rename/rename_13.c
+++ b/testsuite/libsmbclient/src/rename/rename_13.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int fd1 = 0;
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/rename/rename_14.c b/testsuite/libsmbclient/src/rename/rename_14.c
index dc96a9e1a99..2ba64a56ce6 100644
--- a/testsuite/libsmbclient/src/rename/rename_14.c
+++ b/testsuite/libsmbclient/src/rename/rename_14.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int fd1 = 0;
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/rename/rename_2.c b/testsuite/libsmbclient/src/rename/rename_2.c
index ee0ad9734d4..53405770360 100644
--- a/testsuite/libsmbclient/src/rename/rename_2.c
+++ b/testsuite/libsmbclient/src/rename/rename_2.c
@@ -31,8 +31,8 @@ int main(int argc, char** argv)
 	int err = -1;
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/rename/rename_3.c b/testsuite/libsmbclient/src/rename/rename_3.c
index 06684a7d246..84dc3b440a0 100644
--- a/testsuite/libsmbclient/src/rename/rename_3.c
+++ b/testsuite/libsmbclient/src/rename/rename_3.c
@@ -31,8 +31,8 @@ int main(int argc, char** argv)
 	int err = -1;
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/rename/rename_4.c b/testsuite/libsmbclient/src/rename/rename_4.c
index 46d1119f26d..fc75fca14cf 100644
--- a/testsuite/libsmbclient/src/rename/rename_4.c
+++ b/testsuite/libsmbclient/src/rename/rename_4.c
@@ -31,8 +31,8 @@ int main(int argc, char** argv)
 	int err = -1;
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/rename/rename_5.c b/testsuite/libsmbclient/src/rename/rename_5.c
index c579f2e94e1..58cc9029057 100644
--- a/testsuite/libsmbclient/src/rename/rename_5.c
+++ b/testsuite/libsmbclient/src/rename/rename_5.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int fd = 0;
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/rename/rename_6.c b/testsuite/libsmbclient/src/rename/rename_6.c
index 4886298fce2..7ea2afc6035 100644
--- a/testsuite/libsmbclient/src/rename/rename_6.c
+++ b/testsuite/libsmbclient/src/rename/rename_6.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int fd = 0;
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/rename/rename_7.c b/testsuite/libsmbclient/src/rename/rename_7.c
index aa2cbd2485e..773cb6926d3 100644
--- a/testsuite/libsmbclient/src/rename/rename_7.c
+++ b/testsuite/libsmbclient/src/rename/rename_7.c
@@ -33,8 +33,8 @@ int main(int argc, char** argv)
 	int fd2 = 0;
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/rename/rename_8.c b/testsuite/libsmbclient/src/rename/rename_8.c
index 857286a9dc9..6a44d9fb639 100644
--- a/testsuite/libsmbclient/src/rename/rename_8.c
+++ b/testsuite/libsmbclient/src/rename/rename_8.c
@@ -33,8 +33,8 @@ int main(int argc, char** argv)
 	int fd2 = 0;
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 7 )
 	{
diff --git a/testsuite/libsmbclient/src/rename/rename_9.c b/testsuite/libsmbclient/src/rename/rename_9.c
index a868cb1b455..3f0386db004 100644
--- a/testsuite/libsmbclient/src/rename/rename_9.c
+++ b/testsuite/libsmbclient/src/rename/rename_9.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int fd1 = 0;
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 9 )
 	{
diff --git a/testsuite/libsmbclient/src/rmdir/rmdir_1.c b/testsuite/libsmbclient/src/rmdir/rmdir_1.c
index 167730847d4..09717d12692 100644
--- a/testsuite/libsmbclient/src/rmdir/rmdir_1.c
+++ b/testsuite/libsmbclient/src/rmdir/rmdir_1.c
@@ -31,8 +31,8 @@ int main(int argc, char** argv)
 	int err = -1;
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/rmdir/rmdir_2.c b/testsuite/libsmbclient/src/rmdir/rmdir_2.c
index d454d935ff9..bc9b0189eaa 100644
--- a/testsuite/libsmbclient/src/rmdir/rmdir_2.c
+++ b/testsuite/libsmbclient/src/rmdir/rmdir_2.c
@@ -31,8 +31,8 @@ int main(int argc, char** argv)
 	int err = -1;
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/rmdir/rmdir_3.c b/testsuite/libsmbclient/src/rmdir/rmdir_3.c
index 23b90bd749f..bab003378d5 100644
--- a/testsuite/libsmbclient/src/rmdir/rmdir_3.c
+++ b/testsuite/libsmbclient/src/rmdir/rmdir_3.c
@@ -31,8 +31,8 @@ int main(int argc, char** argv)
 	int err = -1;
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/rmdir/rmdir_4.c b/testsuite/libsmbclient/src/rmdir/rmdir_4.c
index 4cec82c2769..48699a3b8c1 100644
--- a/testsuite/libsmbclient/src/rmdir/rmdir_4.c
+++ b/testsuite/libsmbclient/src/rmdir/rmdir_4.c
@@ -31,8 +31,8 @@ int main(int argc, char** argv)
 	int err = -1;
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/rmdir/rmdir_5.c b/testsuite/libsmbclient/src/rmdir/rmdir_5.c
index 3133ca4fe73..092c51a14af 100644
--- a/testsuite/libsmbclient/src/rmdir/rmdir_5.c
+++ b/testsuite/libsmbclient/src/rmdir/rmdir_5.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int fd1 = 0;
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/rmdir/rmdir_6.c b/testsuite/libsmbclient/src/rmdir/rmdir_6.c
index 5f8079156ba..e021c24d2a0 100644
--- a/testsuite/libsmbclient/src/rmdir/rmdir_6.c
+++ b/testsuite/libsmbclient/src/rmdir/rmdir_6.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int fd1 = 0;
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/stat/stat_1.c b/testsuite/libsmbclient/src/stat/stat_1.c
index 198d24d0166..6a7d61f4227 100644
--- a/testsuite/libsmbclient/src/stat/stat_1.c
+++ b/testsuite/libsmbclient/src/stat/stat_1.c
@@ -33,8 +33,8 @@ int main(int argc, char** argv)
 	char url[MAX_BUFF_SIZE];
 	struct stat st;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/stat/stat_2.c b/testsuite/libsmbclient/src/stat/stat_2.c
index 7e73de194dc..c12048def4b 100644
--- a/testsuite/libsmbclient/src/stat/stat_2.c
+++ b/testsuite/libsmbclient/src/stat/stat_2.c
@@ -33,8 +33,8 @@ int main(int argc, char** argv)
 	char url[MAX_BUFF_SIZE];
 	struct stat st;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/stat/stat_3.c b/testsuite/libsmbclient/src/stat/stat_3.c
index eb05ee701b9..ee14f3232b5 100644
--- a/testsuite/libsmbclient/src/stat/stat_3.c
+++ b/testsuite/libsmbclient/src/stat/stat_3.c
@@ -34,8 +34,8 @@ int main(int argc, char** argv)
 	char url[MAX_BUFF_SIZE];
 	struct stat st;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/stat/stat_4.c b/testsuite/libsmbclient/src/stat/stat_4.c
index 03a1616e702..4aa751032b1 100644
--- a/testsuite/libsmbclient/src/stat/stat_4.c
+++ b/testsuite/libsmbclient/src/stat/stat_4.c
@@ -34,8 +34,8 @@ int main(int argc, char** argv)
 	char url[MAX_BUFF_SIZE];
 	struct stat st;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/stat/stat_5.c b/testsuite/libsmbclient/src/stat/stat_5.c
index dd550f92c9e..cef0913bad4 100644
--- a/testsuite/libsmbclient/src/stat/stat_5.c
+++ b/testsuite/libsmbclient/src/stat/stat_5.c
@@ -36,8 +36,8 @@ int main(int argc, char** argv)
 	char* message;
 	struct stat st;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/stat/stat_6.c b/testsuite/libsmbclient/src/stat/stat_6.c
index 070b9c4561f..b765c8c293f 100644
--- a/testsuite/libsmbclient/src/stat/stat_6.c
+++ b/testsuite/libsmbclient/src/stat/stat_6.c
@@ -37,8 +37,8 @@ int main(int argc, char** argv)
 	char* message;
 	struct stat st;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/stat/stat_k.c b/testsuite/libsmbclient/src/stat/stat_k.c
index 8948734182a..d67195cfd30 100644
--- a/testsuite/libsmbclient/src/stat/stat_k.c
+++ b/testsuite/libsmbclient/src/stat/stat_k.c
@@ -36,8 +36,8 @@ int main(int argc, char** argv)
 	char *user;
 	SMBCCTX *ctx;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 2)
 	{
diff --git a/testsuite/libsmbclient/src/telldir/telldir_1.c b/testsuite/libsmbclient/src/telldir/telldir_1.c
index 5e6cb94bb16..8bba7b0680f 100644
--- a/testsuite/libsmbclient/src/telldir/telldir_1.c
+++ b/testsuite/libsmbclient/src/telldir/telldir_1.c
@@ -42,11 +42,11 @@ int main(int argc, char** argv)
 	char file_url[MAX_BUFF_SIZE];
 	char dir_url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
-	bzero(file_url,MAX_BUFF_SIZE);
-	bzero(dir_url,MAX_BUFF_SIZE);
-	bzero(buff,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
+	memset(file_url, '\0', MAX_BUFF_SIZE);
+	memset(dir_url, '\0', MAX_BUFF_SIZE);
+	memset(buff, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/telldir/telldir_2.c b/testsuite/libsmbclient/src/telldir/telldir_2.c
index 45a4d158b0d..3f9a24dc9c5 100644
--- a/testsuite/libsmbclient/src/telldir/telldir_2.c
+++ b/testsuite/libsmbclient/src/telldir/telldir_2.c
@@ -42,11 +42,11 @@ int main(int argc, char** argv)
 	char file_url[MAX_BUFF_SIZE];
 	char dir_url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
-	bzero(file_url,MAX_BUFF_SIZE);
-	bzero(dir_url,MAX_BUFF_SIZE);
-	bzero(buff,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
+	memset(file_url, '\0', MAX_BUFF_SIZE);
+	memset(dir_url, '\0', MAX_BUFF_SIZE);
+	memset(buff, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/telldir/telldir_3.c b/testsuite/libsmbclient/src/telldir/telldir_3.c
index 67a7dc696fb..937d9a61adf 100644
--- a/testsuite/libsmbclient/src/telldir/telldir_3.c
+++ b/testsuite/libsmbclient/src/telldir/telldir_3.c
@@ -34,8 +34,8 @@ int main(int argc, char** argv)
 
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/telldir/telldir_4.c b/testsuite/libsmbclient/src/telldir/telldir_4.c
index 852917456bc..caef669ba78 100644
--- a/testsuite/libsmbclient/src/telldir/telldir_4.c
+++ b/testsuite/libsmbclient/src/telldir/telldir_4.c
@@ -34,8 +34,8 @@ int main(int argc, char** argv)
 
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/telldir/telldir_5.c b/testsuite/libsmbclient/src/telldir/telldir_5.c
index 1984ffb9b70..2b9306270ed 100644
--- a/testsuite/libsmbclient/src/telldir/telldir_5.c
+++ b/testsuite/libsmbclient/src/telldir/telldir_5.c
@@ -48,11 +48,11 @@ int main(int argc, char** argv)
 	char dir_url[MAX_BUFF_SIZE];
 	char dirbuff[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
-	bzero(file_url,MAX_BUFF_SIZE);
-	bzero(dir_url,MAX_BUFF_SIZE);
-	bzero(buff,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
+	memset(file_url, '\0', MAX_BUFF_SIZE);
+	memset(dir_url, '\0', MAX_BUFF_SIZE);
+	memset(buff, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/unlink/unlink_1.c b/testsuite/libsmbclient/src/unlink/unlink_1.c
index d1902eeeead..119f06b8cf5 100644
--- a/testsuite/libsmbclient/src/unlink/unlink_1.c
+++ b/testsuite/libsmbclient/src/unlink/unlink_1.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int fd = 0; 
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/unlink/unlink_10.c b/testsuite/libsmbclient/src/unlink/unlink_10.c
index f70e687e77c..b5c52009346 100644
--- a/testsuite/libsmbclient/src/unlink/unlink_10.c
+++ b/testsuite/libsmbclient/src/unlink/unlink_10.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int fd = 0; 
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/unlink/unlink_11.c b/testsuite/libsmbclient/src/unlink/unlink_11.c
index 5573131e904..dc9ee676c58 100644
--- a/testsuite/libsmbclient/src/unlink/unlink_11.c
+++ b/testsuite/libsmbclient/src/unlink/unlink_11.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int fd = 0; 
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/unlink/unlink_12.c b/testsuite/libsmbclient/src/unlink/unlink_12.c
index d53ac523646..3851dc75c98 100644
--- a/testsuite/libsmbclient/src/unlink/unlink_12.c
+++ b/testsuite/libsmbclient/src/unlink/unlink_12.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int fd = 0; 
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/unlink/unlink_2.c b/testsuite/libsmbclient/src/unlink/unlink_2.c
index 29bbbb13693..deeb89fd9ce 100644
--- a/testsuite/libsmbclient/src/unlink/unlink_2.c
+++ b/testsuite/libsmbclient/src/unlink/unlink_2.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int fd = 0; 
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/unlink/unlink_3.c b/testsuite/libsmbclient/src/unlink/unlink_3.c
index 800823850dc..b102b4310e8 100644
--- a/testsuite/libsmbclient/src/unlink/unlink_3.c
+++ b/testsuite/libsmbclient/src/unlink/unlink_3.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int fd = 0; 
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/unlink/unlink_4.c b/testsuite/libsmbclient/src/unlink/unlink_4.c
index bd96afba34e..cb100afcd43 100644
--- a/testsuite/libsmbclient/src/unlink/unlink_4.c
+++ b/testsuite/libsmbclient/src/unlink/unlink_4.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int fd = 0; 
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 7 )
 	{
diff --git a/testsuite/libsmbclient/src/unlink/unlink_5.c b/testsuite/libsmbclient/src/unlink/unlink_5.c
index 63de3cb7143..c3e89bddd6a 100644
--- a/testsuite/libsmbclient/src/unlink/unlink_5.c
+++ b/testsuite/libsmbclient/src/unlink/unlink_5.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int fd = 0; 
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/unlink/unlink_6.c b/testsuite/libsmbclient/src/unlink/unlink_6.c
index 51bafc45ae6..a048bdd6b08 100644
--- a/testsuite/libsmbclient/src/unlink/unlink_6.c
+++ b/testsuite/libsmbclient/src/unlink/unlink_6.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int fd = 0; 
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/unlink/unlink_7.c b/testsuite/libsmbclient/src/unlink/unlink_7.c
index 12419ef450d..0e7c6f55810 100644
--- a/testsuite/libsmbclient/src/unlink/unlink_7.c
+++ b/testsuite/libsmbclient/src/unlink/unlink_7.c
@@ -32,8 +32,8 @@ int main(int argc, char** argv)
 	int fd = 0; 
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 7 )
 	{
diff --git a/testsuite/libsmbclient/src/unlink/unlink_8.c b/testsuite/libsmbclient/src/unlink/unlink_8.c
index 71c92c1f1ff..112af5588a8 100644
--- a/testsuite/libsmbclient/src/unlink/unlink_8.c
+++ b/testsuite/libsmbclient/src/unlink/unlink_8.c
@@ -31,8 +31,8 @@ int main(int argc, char** argv)
 	int err = -1;
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/unlink/unlink_9.c b/testsuite/libsmbclient/src/unlink/unlink_9.c
index 92789ac9646..04af8d9f1e2 100644
--- a/testsuite/libsmbclient/src/unlink/unlink_9.c
+++ b/testsuite/libsmbclient/src/unlink/unlink_9.c
@@ -31,8 +31,8 @@ int main(int argc, char** argv)
 	int err = -1;
 	char url[MAX_BUFF_SIZE];
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_1.c b/testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_1.c
index e3feb214c4c..2741829ecdc 100644
--- a/testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_1.c
+++ b/testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_1.c
@@ -55,10 +55,10 @@ int main(int argc, char** argv)
 	char url[MAX_BUFF_SIZE];
 	char* message;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
-	bzero(g_print_user,MAX_BUFF_SIZE);
-	bzero(g_print_name,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
+	memset(g_print_user, '\0', MAX_BUFF_SIZE);
+	memset(g_print_name, '\0', MAX_BUFF_SIZE);
 
 	g_print_id = 0;
 	g_print_priority = 0;
diff --git a/testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_2.c b/testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_2.c
index 6de6b3d0b18..0a9cdb4617d 100644
--- a/testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_2.c
+++ b/testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_2.c
@@ -55,10 +55,10 @@ int main(int argc, char** argv)
 	char url[MAX_BUFF_SIZE];
 	char* message;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
-	bzero(g_print_user,MAX_BUFF_SIZE);
-	bzero(g_print_name,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
+	memset(g_print_user, '\0', MAX_BUFF_SIZE);
+	memset(g_print_name, '\0', MAX_BUFF_SIZE);
 
 	g_print_id = 0;
 	g_print_priority = 0;
diff --git a/testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_3.c b/testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_3.c
index 50c9464e00a..feac086912f 100644
--- a/testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_3.c
+++ b/testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_3.c
@@ -55,10 +55,10 @@ int main(int argc, char** argv)
 	char url[MAX_BUFF_SIZE];
 	char* message;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
-	bzero(g_print_user,MAX_BUFF_SIZE);
-	bzero(g_print_name,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
+	memset(g_print_user, '\0', MAX_BUFF_SIZE);
+	memset(g_print_name, '\0', MAX_BUFF_SIZE);
 
 	g_print_id = 0;
 	g_print_priority = 0;
diff --git a/testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_4.c b/testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_4.c
index c776bdff0a1..ff73be9d992 100644
--- a/testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_4.c
+++ b/testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_4.c
@@ -55,10 +55,10 @@ int main(int argc, char** argv)
 	char url[MAX_BUFF_SIZE];
 	char* message;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
-	bzero(g_print_user,MAX_BUFF_SIZE);
-	bzero(g_print_name,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
+	memset(g_print_user, '\0', MAX_BUFF_SIZE);
+	memset(g_print_name, '\0', MAX_BUFF_SIZE);
 
 	g_print_id = 0;
 	g_print_priority = 0;
diff --git a/testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_5.c b/testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_5.c
index b3f76a42106..b2231f799bf 100644
--- a/testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_5.c
+++ b/testsuite/libsmbclient/src/unlink_print_job/unlink_print_job_5.c
@@ -70,10 +70,10 @@ int main(int argc, char** argv)
 	char url[MAX_BUFF_SIZE];
 	char* message;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
-	bzero(g_print_user,MAX_BUFF_SIZE);
-	bzero(g_print_name,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
+	memset(g_print_user, '\0', MAX_BUFF_SIZE);
+	memset(g_print_name, '\0', MAX_BUFF_SIZE);
 
 	g_print_id = 0;
 	g_print_priority = 0;
diff --git a/testsuite/libsmbclient/src/write/write_1.c b/testsuite/libsmbclient/src/write/write_1.c
index 9cc80df763c..b3631a02fe1 100644
--- a/testsuite/libsmbclient/src/write/write_1.c
+++ b/testsuite/libsmbclient/src/write/write_1.c
@@ -35,8 +35,8 @@ int main(int argc, char** argv)
 	char url[MAX_BUFF_SIZE];
 	char* message;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/write/write_10.c b/testsuite/libsmbclient/src/write/write_10.c
index 3796dad40f5..65970982d2e 100644
--- a/testsuite/libsmbclient/src/write/write_10.c
+++ b/testsuite/libsmbclient/src/write/write_10.c
@@ -35,8 +35,8 @@ int main(int argc, char** argv)
 	char url[MAX_BUFF_SIZE];
 	char* message = NULL;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{
diff --git a/testsuite/libsmbclient/src/write/write_11.c b/testsuite/libsmbclient/src/write/write_11.c
index 413b35d5877..f0609134ec6 100644
--- a/testsuite/libsmbclient/src/write/write_11.c
+++ b/testsuite/libsmbclient/src/write/write_11.c
@@ -36,8 +36,8 @@ int main(int argc, char** argv)
 	char* message;
 	char* response;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/write/write_12.c b/testsuite/libsmbclient/src/write/write_12.c
index 6d21f889db8..b45bc26e60d 100644
--- a/testsuite/libsmbclient/src/write/write_12.c
+++ b/testsuite/libsmbclient/src/write/write_12.c
@@ -36,8 +36,8 @@ int main(int argc, char** argv)
 	char* message;
 	char* response;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/write/write_13.c b/testsuite/libsmbclient/src/write/write_13.c
index 9780646451c..9e63528485a 100644
--- a/testsuite/libsmbclient/src/write/write_13.c
+++ b/testsuite/libsmbclient/src/write/write_13.c
@@ -36,8 +36,8 @@ int main(int argc, char** argv)
 	char* message;
 	char* response;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/write/write_2.c b/testsuite/libsmbclient/src/write/write_2.c
index eed3eea2848..c9861d8e5cd 100644
--- a/testsuite/libsmbclient/src/write/write_2.c
+++ b/testsuite/libsmbclient/src/write/write_2.c
@@ -35,8 +35,8 @@ int main(int argc, char** argv)
 	char url[MAX_BUFF_SIZE];
 	char* message;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/write/write_3.c b/testsuite/libsmbclient/src/write/write_3.c
index c91b08a76c6..1948bbdf64f 100644
--- a/testsuite/libsmbclient/src/write/write_3.c
+++ b/testsuite/libsmbclient/src/write/write_3.c
@@ -35,8 +35,8 @@ int main(int argc, char** argv)
 	char url[MAX_BUFF_SIZE];
 	char* message;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/write/write_4.c b/testsuite/libsmbclient/src/write/write_4.c
index 0a1c33740f8..be1b13bdc81 100644
--- a/testsuite/libsmbclient/src/write/write_4.c
+++ b/testsuite/libsmbclient/src/write/write_4.c
@@ -35,8 +35,8 @@ int main(int argc, char** argv)
 	char url[MAX_BUFF_SIZE];
 	char* message;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/write/write_5.c b/testsuite/libsmbclient/src/write/write_5.c
index 6b21177c4d5..eb85445b509 100644
--- a/testsuite/libsmbclient/src/write/write_5.c
+++ b/testsuite/libsmbclient/src/write/write_5.c
@@ -35,8 +35,8 @@ int main(int argc, char** argv)
 	char url[MAX_BUFF_SIZE];
 	char* message;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/write/write_6.c b/testsuite/libsmbclient/src/write/write_6.c
index d92e13b1e6f..29db98ccbe7 100644
--- a/testsuite/libsmbclient/src/write/write_6.c
+++ b/testsuite/libsmbclient/src/write/write_6.c
@@ -35,8 +35,8 @@ int main(int argc, char** argv)
 	char url[MAX_BUFF_SIZE];
 	char* message;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 6 )
 	{
diff --git a/testsuite/libsmbclient/src/write/write_7.c b/testsuite/libsmbclient/src/write/write_7.c
index acbcf57539e..1c581823adb 100644
--- a/testsuite/libsmbclient/src/write/write_7.c
+++ b/testsuite/libsmbclient/src/write/write_7.c
@@ -33,7 +33,7 @@ int main(int argc, char** argv)
 	int fd = 0;
 	char* message = "Testing";
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 4 )
 	{
diff --git a/testsuite/libsmbclient/src/write/write_8.c b/testsuite/libsmbclient/src/write/write_8.c
index da2ae12e775..b660e76e979 100644
--- a/testsuite/libsmbclient/src/write/write_8.c
+++ b/testsuite/libsmbclient/src/write/write_8.c
@@ -33,7 +33,7 @@ int main(int argc, char** argv)
 	int fd = 0;
 	char* message = "Testing";
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 4 )
 	{
diff --git a/testsuite/libsmbclient/src/write/write_9.c b/testsuite/libsmbclient/src/write/write_9.c
index 606bf642ddd..52e9f186e5f 100644
--- a/testsuite/libsmbclient/src/write/write_9.c
+++ b/testsuite/libsmbclient/src/write/write_9.c
@@ -35,8 +35,8 @@ int main(int argc, char** argv)
 	char url[MAX_BUFF_SIZE];
 	char* message = NULL;
 
-	bzero(g_workgroup,MAX_BUFF_SIZE);
-	bzero(url,MAX_BUFF_SIZE);
+	memset(g_workgroup, '\0', MAX_BUFF_SIZE);
+	memset(url, '\0', MAX_BUFF_SIZE);
 
 	if ( argc == 5 )
 	{