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

143 files changed, 347 insertions, 347 deletions

diff --git a/testsuite/libsmbclient/src/chmod/chmod_1.c b/testsuite/libsmbclient/src/chmod/chmod_1.c
index 3d46ba2a8b..4a317c073b 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 3d46ba2a8b..4a317c073b 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 182964c9d2..6b60e59dba 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 41824e9d0f..bd31ab11fd 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 0485bc22be..c8092d7067 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 cb60cf6772..25e14367f5 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 601a018009..7cdbb94b57 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 ffb5c0e80f..1cc859940d 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 1b22b6ef3a..1134d45737 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 6181449e76..ac4934f679 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 f88a8df5c2..2d48eb547c 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 74d4d6fe76..ff05c2d543 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 3e27541a0a..20d3d67c5f 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 24118ad58b..e406ef62c9 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 24118ad58b..e406ef62c9 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 add089d557..b07e56538b 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 d317568444..73248d0c2b 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 fbbd78dfd0..aea6ad0dc8 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 6b8ddb0905..921486cd07 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 2febd26f7a..fefc75676c 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 18be3c7521..fb6b4a7f64 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 b641d7b859..352a1440e4 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 fe56911c84..fea009ae73 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 ec55f2b571..cf290100ca 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 da899696ce..735f123011 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 8df52f8eef..a3b1cd224a 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 e579b07f3c..1501287693 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 21e95bb413..774873699e 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 433e4d26db..00bbf4d3b9 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 fce4629777..e6ebf4cc20 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 2f4f865049..b6a6a535b6 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 b4f2eba36b..e6179ebc9c 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 158c4604f1..1d25337dc4 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 158c4604f1..1d25337dc4 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 66367044b3..dcd9e7dcc1 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 68c3bfc22d..776742dece 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 17f172bb7b..30cfa58805 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 2460a4c067..d778dcb578 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 0610c21757..decf347159 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 8cfae82356..2c3f448530 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 a133bb83a8..86cadc76a8 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 8a1745d659..1a67b2071b 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 12523645c6..a6bfd01cc9 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 94c5997c94..50501d46e3 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 07e11cb9dc..0c1dfe3ce9 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 1acd68d220..42fefa6734 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 272da51f89..fa8038748b 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 dcbd5949eb..11cc51927a 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 7fb107244d..676188c4f5 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 471b498eb9..05f30e96da 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 348fe6f911..df4af7be00 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 4654e6721d..feb87b8fb7 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 84e86e0292..44867f3a35 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 cda9326ef3..d3c5d0002d 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 691fe2d0e1..1e7d0f18f0 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 1495e92e74..8d5a5ac67b 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 f282f42b54..c9ff2fc535 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 db9e9e0aec..149d8c04b0 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 819fca71a0..b298c09bbd 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 7722c83453..9fb6d4e0da 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 29336099e8..9b4e41a65b 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 fcd1f51e39..41de01c1cd 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 196697e455..568c49f348 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 0862d2f4ac..c708619cd8 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 28653c56b8..883c3a6459 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 413b35d587..f0609134ec 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 fb540cc5a5..c4ae1ef8f1 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 9b90e006a5..2dbbb887ae 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 b2cc2766fb..6eab5aff4f 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 8c252ba707..5c05097fc2 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 bb78c6fe84..5620f43e44 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 4cfca3a20f..b9035b0171 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 74ba22747b..25f4416ea4 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 f229f8ecce..4660c1e3b5 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 db9db0daf6..d70a78ec34 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 7273277ab5..dc848b179b 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 7b508a0968..fc0849ff3b 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 dbc453701e..5c7658952f 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 3030b9b117..9854d73e59 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 5d893b50dd..b3c4151583 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 aa77c4027d..e648dda60d 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 707ccffcf6..d2650f9615 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 3953cb1d39..42e5b55138 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 5341197061..e161fd35ec 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 a088f66c4d..b4e80c897f 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 073fbb6eaf..46fa9e312f 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 dc96a9e1a9..2ba64a56ce 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 ee0ad9734d..5340577036 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 06684a7d24..84dc3b440a 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 46d1119f26..fc75fca14c 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 c579f2e94e..58cc902905 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 4886298fce..7ea2afc603 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 aa2cbd2485..773cb6926d 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 857286a9dc..6a44d9fb63 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 a868cb1b45..3f0386db00 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 167730847d..09717d1269 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 d454d935ff..bc9b0189ea 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 23b90bd749..bab003378d 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 4cec82c276..48699a3b8c 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 3133ca4fe7..092c51a14a 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 5f8079156b..e021c24d2a 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 198d24d016..6a7d61f422 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 7e73de194d..c12048def4 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 eb05ee701b..ee14f3232b 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 03a1616e70..4aa751032b 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 dd550f92c9..cef0913bad 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 070b9c4561..b765c8c293 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 8948734182..d67195cfd3 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 5e6cb94bb1..8bba7b0680 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 45a4d158b0..3f9a24dc9c 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 67a7dc696f..937d9a61ad 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 852917456b..caef669ba7 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 1984ffb9b7..2b9306270e 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 d1902eeeea..119f06b8cf 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 f70e687e77..b5c5200934 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 5573131e90..dc9ee676c5 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 d53ac52364..3851dc75c9 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 29bbbb1369..deeb89fd9c 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 800823850d..b102b4310e 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 bd96afba34..cb100afcd4 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 63de3cb714..c3e89bddd6 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 51bafc45ae..a048bdd6b0 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 12419ef450..0e7c6f5581 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 71c92c1f1f..112af5588a 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 92789ac964..04af8d9f1e 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 e3feb214c4..2741829ecd 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 6de6b3d0b1..0a9cdb4617 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 50c9464e00..feac086912 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 c776bdff0a..ff73be9d99 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 b3f76a4210..b2231f799b 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 9cc80df763..b3631a02fe 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 3796dad40f..65970982d2 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 413b35d587..f0609134ec 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 6d21f889db..b45bc26e60 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 9780646451..9e63528485 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 eed3eea284..c9861d8e5c 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 c91b08a76c..1948bbdf64 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 0a1c33740f..be1b13bdc8 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 6b21177c4d..eb85445b50 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 d92e13b1e6..29db98ccbe 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 acbcf57539..1c581823ad 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 da2ae12e77..b660e76e97 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 606bf642dd..52e9f186e5 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 )
 	{