series of perl scripts (thanks tim!) to replace all calls to bzero:

perl -e 's/bzero\((.*),\s*sizeof\(\*\1\)\)/ZERO_STRUCTP($1)/g' -pi */*.c
perl -e 's/bzero\((.*),\s*sizeof\(\1\)\)/ZERO_STRUCT($1)/g' -pi */*.c
perl -e 's/bzero\(&(.*),\s*sizeof\(\1\)\)/ZERO_STRUCT($1)/g' -pi */*.c
perl -e 's/bzero\((.*),(.*)\)/memset($1, 0, $2)/g' -pi */*.c

34 files changed, 150 insertions, 150 deletions

diff --git a/source/client/client.c b/source/client/client.c
index e4454241ebb..2a2f35b970a 100644
--- a/source/client/client.c
+++ b/source/client/client.c
@@ -1875,7 +1875,7 @@ struct cli_state *do_connect(char *server, char *share, int smb_port)
 	}
 
 	/* paranoia: destroy the local copy of the password */
-	bzero(password, sizeof(password)); 
+	ZERO_STRUCT(password); 
 
 	smb_cli->use_ntlmv2 = lp_client_ntlmv2();
 
diff --git a/source/lib/cmd_interp.c b/source/lib/cmd_interp.c
index 3dd3f0731bb..6a460fd3699 100644
--- a/source/lib/cmd_interp.c
+++ b/source/lib/cmd_interp.c
@@ -1007,7 +1007,7 @@ static void cmd_use(struct client_info *info, int argc, char *argv[])
 		}
 
 		/* paranoia: destroy the local copy of the password */
-		bzero(password, sizeof(password));
+		ZERO_STRUCT(password);
 
 		report(out_hnd, "Server:\t%s:\tUser:\t%s\tDomain:\t%s\n",
 		       srv_name, usr.ntc.user_name, usr.ntc.domain);
@@ -1050,7 +1050,7 @@ static void cmd_use(struct client_info *info, int argc, char *argv[])
 	}
 
 	/* paranoia: destroy the local copy of the password */
-	bzero(password, sizeof(password));
+	ZERO_STRUCT(password);
 }
 
 /******************************************************************
@@ -1334,7 +1334,7 @@ static void cmd_set(struct client_info *info, int argc, char *argv[])
 	}
 
 	/* paranoia: destroy the local copy of the password */
-	bzero(password, sizeof(password));
+	ZERO_STRUCT(password);
 
 	fstrcpy(srv_name, "\\\\");
 	fstrcat(srv_name, cli_info.dest_host);
@@ -1392,7 +1392,7 @@ static void read_user_env(struct ntuser_creds *u)
 	set_user_password(u, True, password);
 
 	/* paranoia: destroy the local copy of the password */
-	bzero(password, sizeof(password));
+	ZERO_STRUCT(password);
 }
 
 void readline_init(void)
diff --git a/source/lib/hmacmd5.c b/source/lib/hmacmd5.c
index 4e1cd3c9fda..14a2a038efd 100644
--- a/source/lib/hmacmd5.c
+++ b/source/lib/hmacmd5.c
@@ -48,8 +48,8 @@ void hmac_md5_init_rfc2104(uchar*  key, int key_len, HMACMD5Context *ctx)
         }
 
         /* start out by storing key in pads */
-        bzero( ctx->k_ipad, sizeof ctx->k_ipad);
-        bzero( ctx->k_opad, sizeof ctx->k_opad);
+        ZERO_STRUCT(ctx->k_ipad);
+        ZERO_STRUCT(ctx->k_opad);
         bcopy( key, ctx->k_ipad, key_len);
         bcopy( key, ctx->k_opad, key_len);
 
@@ -79,8 +79,8 @@ void hmac_md5_init_limK_to_64(const uchar* key, int key_len,
         }
 
         /* start out by storing key in pads */
-        bzero( ctx->k_ipad, sizeof ctx->k_ipad);
-        bzero( ctx->k_opad, sizeof ctx->k_opad);
+        ZERO_STRUCT(ctx->k_ipad);
+        ZERO_STRUCT(ctx->k_opad);
         bcopy( key, ctx->k_ipad, key_len);
         bcopy( key, ctx->k_opad, key_len);
 
diff --git a/source/lib/membuffer.c b/source/lib/membuffer.c
index fc4a88aeadf..4d83cfeb454 100644
--- a/source/lib/membuffer.c
+++ b/source/lib/membuffer.c
@@ -125,7 +125,7 @@ BOOL mem_alloc_data(struct mem_buf *buf, int size)
 		return False;
 	}
 
-	bzero(buf->data, buf->data_size);
+	memset(buf->data, 0,  buf->data_size);
 	buf->offset.end   = buf->offset.start + size;
 
 	CHECK_STRUCT(buf);
diff --git a/source/lib/streams.c b/source/lib/streams.c
index 8e6ad9f53aa..7a974082e70 100644
--- a/source/lib/streams.c
+++ b/source/lib/streams.c
@@ -102,9 +102,9 @@ void writedefaultafp(int fd, SambaAfpInfo *safp, int writeit)
 	safp->afp.afpi_Version = AFP_Version;     			/* Must be 0x00010000 */
 	safp->afp.afpi_Reserved1 = 0;
 	safp->afp.afpi_BackupTime = AFP_BackupTime;  		/* Backup time for the file/dir */
-	bzero(safp->afp.afpi_FinderInfo, AFP_FinderSize);	/* Finder Info (32 bytes) */
-	bzero(safp->afp.afpi_ProDosInfo, 6);	/* ProDos Info (6 bytes) # */
-	bzero(safp->afp.afpi_Reserved2, 6);
+	memset(safp->afp.afpi_FinderInfo, 0,  AFP_FinderSize);	/* Finder Info (32 bytes) */
+	memset(safp->afp.afpi_ProDosInfo, 0,  6);	/* ProDos Info (6 bytes) # */
+	memset(safp->afp.afpi_Reserved2, 0,  6);
 	safp->createtime = time(NULL);
 	if (writeit) (void)write(fd, safp, sizeof(*safp));
 }
diff --git a/source/lib/util.c b/source/lib/util.c
index dacd83156c6..5f30b7eedf5 100644
--- a/source/lib/util.c
+++ b/source/lib/util.c
@@ -432,7 +432,7 @@ void smb_setlen(char *buf, int len)
 int set_message(char *buf, int num_words, int num_bytes, BOOL zero)
 {
 	if (zero)
-		bzero(buf + smb_size, num_words * 2 + num_bytes);
+		memset(buf + smb_size, 0,  num_words * 2 + num_bytes);
 	CVAL(buf, smb_wct) = num_words;
 	SSVAL(buf, smb_vwv + num_words * SIZEOFWORD, num_bytes);
 	smb_setlen(buf, smb_size + num_words * 2 + num_bytes - 4);
@@ -539,7 +539,7 @@ void make_dir_struct(char *buf, char *mask, char *fname, SMB_OFF_T size,
 	else
 		memcpy(buf + 1, mask2, MIN(strlen(mask2), 11));
 
-	bzero(buf + 21, DIR_STRUCT_SIZE - 21);
+	memset(buf + 21, 0,  DIR_STRUCT_SIZE - 21);
 	CVAL(buf, 21) = mode;
 	put_dos_date(buf, 22, date);
 	SSVAL(buf, 26, size & 0xFFFF);
diff --git a/source/lib/util_sock.c b/source/lib/util_sock.c
index 7776c434ecd..c20cbf6700c 100644
--- a/source/lib/util_sock.c
+++ b/source/lib/util_sock.c
@@ -246,8 +246,8 @@ ssize_t read_udp_socket(int fd, char *buf, size_t len)
 	int socklen;
 
 	socklen = sizeof(sock);
-	bzero((char *)&sock, socklen);
-	bzero((char *)&lastip, sizeof(lastip));
+	memset((char *)&sock, 0,  socklen);
+	ZERO_STRUCT(lastip);
 	ret =
 		(ssize_t) recvfrom(fd, buf, len, 0, (struct sockaddr *)&sock,
 				   &socklen);
@@ -562,7 +562,7 @@ BOOL receive_smb(int fd, char *buffer, unsigned int timeout)
 
 	smb_read_error = 0;
 
-	bzero(buffer, smb_size + 100);
+	memset(buffer, 0,  smb_size + 100);
 
 	len = read_smb_length_return_keepalive(fd, buffer, timeout);
 	if (len < 0)
@@ -687,7 +687,7 @@ BOOL send_one_packet(char *buf, int len, struct in_addr ip, int port,
 	}
 
 	/* set the address and port */
-	bzero((char *)&sock_out, sizeof(sock_out));
+	ZERO_STRUCT(sock_out);
 	putip((char *)&sock_out.sin_addr, (char *)&ip);
 	sock_out.sin_port = htons(port);
 	sock_out.sin_family = AF_INET;
@@ -738,7 +738,7 @@ int open_socket_in(int type, int port, int dlevel, uint32 socket_addr,
 		return -1;
 	}
 
-	bzero((char *)&sock, sizeof(sock));
+	ZERO_STRUCT(sock);
 	memcpy((char *)&sock.sin_addr, (char *)hp->h_addr, hp->h_length);
 
 #ifdef HAVE_SOCK_SIN_LEN
@@ -814,7 +814,7 @@ int open_socket_out(int type, struct in_addr *addr, int port, int timeout)
 	if (type != SOCK_STREAM)
 		return (res);
 
-	bzero((char *)&sock_out, sizeof(sock_out));
+	ZERO_STRUCT(sock_out);
 	putip((char *)&sock_out.sin_addr, (char *)addr);
 
 	sock_out.sin_port = htons(port);
diff --git a/source/libsmb/clientgen.c b/source/libsmb/clientgen.c
index 2df36a0b62b..28212a639a6 100644
--- a/source/libsmb/clientgen.c
+++ b/source/libsmb/clientgen.c
@@ -316,7 +316,7 @@ BOOL cli_send_trans(struct cli_state *cli, int trans,
 	this_lparam = MIN(lparam,cli->max_xmit - (500+lsetup*2)); /* hack */
 	this_ldata = MIN(ldata,cli->max_xmit - (500+lsetup*2+this_lparam));
 
-	bzero(cli->outbuf,smb_size);
+	memset(cli->outbuf, 0, smb_size);
 	set_message(cli->outbuf,14+lsetup,0,True);
 	CVAL(cli->outbuf,smb_com) = trans;
 	SSVAL(cli->outbuf,smb_tid, cli->cnum);
@@ -788,7 +788,7 @@ BOOL cli_session_setup_x(struct cli_state *cli,
 	}
 
 	/* send a session setup command */
-	bzero(cli->outbuf,smb_size);
+	memset(cli->outbuf, 0, smb_size);
 
 	if (cli->protocol < PROTOCOL_NT1)
 	{
@@ -1059,7 +1059,7 @@ BOOL cli_ulogoff(struct cli_state *cli)
 		return True;
 	}
 
-        bzero(cli->outbuf,smb_size);
+        memset(cli->outbuf, 0, smb_size);
         set_message(cli->outbuf,2,0,True);
         CVAL(cli->outbuf,smb_com) = SMBulogoffX;
         cli_setup_packet(cli);
@@ -1081,8 +1081,8 @@ BOOL cli_send_tconX(struct cli_state *cli,
 {
 	fstring fullshare, pword;
 	char *p;
-	bzero(cli->outbuf,smb_size);
-	bzero(cli->inbuf,smb_size);
+	memset(cli->outbuf, 0, smb_size);
+	memset(cli->inbuf, 0, smb_size);
 
 	fstrcpy(cli->share, share);
 
@@ -1158,7 +1158,7 @@ send a tree disconnect
 ****************************************************************************/
 BOOL cli_tdis(struct cli_state *cli)
 {
-	bzero(cli->outbuf,smb_size);
+	memset(cli->outbuf, 0, smb_size);
 	set_message(cli->outbuf,0,0,True);
 	CVAL(cli->outbuf,smb_com) = SMBtdis;
 	SSVAL(cli->outbuf,smb_tid,cli->cnum);
@@ -1178,8 +1178,8 @@ BOOL cli_rename(struct cli_state *cli, char *fname_src, char *fname_dst)
 {
         char *p;
 
-        bzero(cli->outbuf,smb_size);
-        bzero(cli->inbuf,smb_size);
+        memset(cli->outbuf, 0, smb_size);
+        memset(cli->inbuf, 0, smb_size);
 
         set_message(cli->outbuf,1, 4 + strlen(fname_src) + strlen(fname_dst), True);
 
@@ -1215,8 +1215,8 @@ BOOL cli_unlink(struct cli_state *cli, char *fname)
 {
 	char *p;
 
-	bzero(cli->outbuf,smb_size);
-	bzero(cli->inbuf,smb_size);
+	memset(cli->outbuf, 0, smb_size);
+	memset(cli->inbuf, 0, smb_size);
 
 	set_message(cli->outbuf,1, 2 + strlen(fname),True);
 
@@ -1249,8 +1249,8 @@ BOOL cli_mkdir(struct cli_state *cli, char *dname)
 {
 	char *p;
 
-	bzero(cli->outbuf,smb_size);
-	bzero(cli->inbuf,smb_size);
+	memset(cli->outbuf, 0, smb_size);
+	memset(cli->inbuf, 0, smb_size);
 
 	set_message(cli->outbuf,0, 2 + strlen(dname),True);
 
@@ -1281,8 +1281,8 @@ BOOL cli_rmdir(struct cli_state *cli, char *dname)
 {
 	char *p;
 
-	bzero(cli->outbuf,smb_size);
-	bzero(cli->inbuf,smb_size);
+	memset(cli->outbuf, 0, smb_size);
+	memset(cli->inbuf, 0, smb_size);
 
 	set_message(cli->outbuf,0, 2 + strlen(dname),True);
 
@@ -1315,8 +1315,8 @@ int cli_nt_create(struct cli_state *cli, const char *fname)
 {
 	char *p;
 
-	bzero(cli->outbuf,smb_size);
-	bzero(cli->inbuf,smb_size);
+	memset(cli->outbuf, 0, smb_size);
+	memset(cli->inbuf, 0, smb_size);
 
 	set_message(cli->outbuf,24,1 + strlen(fname),True);
 
@@ -1391,8 +1391,8 @@ int cli_open(struct cli_state *cli, const char *fname,
 	}
 #endif /* O_SYNC */
 
-	bzero(cli->outbuf,smb_size);
-	bzero(cli->inbuf,smb_size);
+	memset(cli->outbuf, 0, smb_size);
+	memset(cli->inbuf, 0, smb_size);
 
 	set_message(cli->outbuf,15,1 + strlen(fname),True);
 
@@ -1432,8 +1432,8 @@ int cli_open(struct cli_state *cli, const char *fname,
 ****************************************************************************/
 BOOL cli_close(struct cli_state *cli, int fnum)
 {
-	bzero(cli->outbuf,smb_size);
-	bzero(cli->inbuf,smb_size);
+	memset(cli->outbuf, 0, smb_size);
+	memset(cli->inbuf, 0, smb_size);
 
 	set_message(cli->outbuf,3,0,True);
 
@@ -1465,8 +1465,8 @@ BOOL cli_lock(struct cli_state *cli, int fnum, uint32 offset, uint32 len, int ti
 	char *p;
         int saved_timeout = cli->timeout;
 
-	bzero(cli->outbuf,smb_size);
-	bzero(cli->inbuf,smb_size);
+	memset(cli->outbuf, 0, smb_size);
+	memset(cli->inbuf, 0, smb_size);
 
 	set_message(cli->outbuf,8,10,True);
 
@@ -1510,8 +1510,8 @@ BOOL cli_unlock(struct cli_state *cli, int fnum, uint32 offset, uint32 len, int
 {
 	char *p;
 
-	bzero(cli->outbuf,smb_size);
-	bzero(cli->inbuf,smb_size);
+	memset(cli->outbuf, 0, smb_size);
+	memset(cli->inbuf, 0, smb_size);
 
 	set_message(cli->outbuf,8,10,True);
 
@@ -1551,8 +1551,8 @@ issue a single SMBread and don't wait for a reply
 static void cli_issue_read(struct cli_state *cli, int fnum, off_t offset, 
 			   size_t size, int i)
 {
-	bzero(cli->outbuf,smb_size);
-	bzero(cli->inbuf,smb_size);
+	memset(cli->outbuf, 0, smb_size);
+	memset(cli->inbuf, 0, smb_size);
 
 	set_message(cli->outbuf,10,0,True);
 		
@@ -1695,8 +1695,8 @@ static void cli_issue_write(struct cli_state *cli, int fnum, off_t offset, uint1
 {
 	char *p;
 
-	bzero(cli->outbuf,smb_size);
-	bzero(cli->inbuf,smb_size);
+	memset(cli->outbuf, 0, smb_size);
+	memset(cli->inbuf, 0, smb_size);
 
 	set_message(cli->outbuf,12,size,True);
 	
@@ -1801,8 +1801,8 @@ BOOL cli_getattrE(struct cli_state *cli, int fd,
 		  uint16 *attr, size_t *size, 
 		  time_t *c_time, time_t *a_time, time_t *m_time)
 {
-	bzero(cli->outbuf,smb_size);
-	bzero(cli->inbuf,smb_size);
+	memset(cli->outbuf, 0, smb_size);
+	memset(cli->inbuf, 0, smb_size);
 
 	set_message(cli->outbuf,2,0,True);
 
@@ -1853,8 +1853,8 @@ BOOL cli_getatr(struct cli_state *cli, char *fname,
 {
 	char *p;
 
-	bzero(cli->outbuf,smb_size);
-	bzero(cli->inbuf,smb_size);
+	memset(cli->outbuf, 0, smb_size);
+	memset(cli->inbuf, 0, smb_size);
 
 	set_message(cli->outbuf,0,strlen(fname)+2,True);
 
@@ -1899,8 +1899,8 @@ BOOL cli_setatr(struct cli_state *cli, char *fname, uint16 attr, time_t t)
 {
 	char *p;
 
-	bzero(cli->outbuf,smb_size);
-	bzero(cli->inbuf,smb_size);
+	memset(cli->outbuf, 0, smb_size);
+	memset(cli->inbuf, 0, smb_size);
 
 	set_message(cli->outbuf,8,strlen(fname)+4,True);
 
@@ -2517,7 +2517,7 @@ BOOL cli_negprot(struct cli_state *cli)
 	int numprots;
 	int plength;
 
-	bzero(cli->outbuf,smb_size);
+	memset(cli->outbuf, 0, smb_size);
 
 	/* setup the protocol strings */
 	for (plength=0,numprots=0;
@@ -3650,7 +3650,7 @@ int cli_printjob_del(struct cli_state *cli, int job)
 	int rdrcnt,rprcnt, ret = -1;
 	pstring param;
 
-	bzero(param,sizeof(param));
+	ZERO_STRUCT(param);
 
 	p = param;
 	SSVAL(p,0,81);		/* DosPrintJobDel() */
@@ -3691,7 +3691,7 @@ int cli_print_queue(struct cli_state *cli,
 	int result_code=0;
 	int i = -1;
 	
-	bzero(param,sizeof(param));
+	ZERO_STRUCT(param);
 
 	p = param;
 	SSVAL(p,0,76);         /* API function number 76 (DosPrintJobEnum) */
@@ -3760,7 +3760,7 @@ BOOL cli_chkpath(struct cli_state *cli, char *path)
 	trim_string(path2,NULL,"\\");
 	if (!*path2) *path2 = '\\';
 	
-	bzero(cli->outbuf,smb_size);
+	memset(cli->outbuf, 0, smb_size);
 	set_message(cli->outbuf,0,4 + strlen(path2),True);
 	SCVAL(cli->outbuf,smb_com,SMBchkpth);
 	SSVAL(cli->outbuf,smb_tid,cli->cnum);
@@ -3790,7 +3790,7 @@ BOOL cli_message_start(struct cli_state *cli, char *host, char *username,
 	char *p;
 
 	/* send a SMBsendstrt command */
-	bzero(cli->outbuf,smb_size);
+	memset(cli->outbuf, 0, smb_size);
 	set_message(cli->outbuf,0,0,True);
 	CVAL(cli->outbuf,smb_com) = SMBsendstrt;
 	SSVAL(cli->outbuf,smb_tid,cli->cnum);
@@ -3827,7 +3827,7 @@ BOOL cli_message_text(struct cli_state *cli, char *msg, int len, int grp)
 {
 	char *p;
 
-	bzero(cli->outbuf,smb_size);
+	memset(cli->outbuf, 0, smb_size);
 	set_message(cli->outbuf,1,len+3,True);
 	CVAL(cli->outbuf,smb_com) = SMBsendtxt;
 	SSVAL(cli->outbuf,smb_tid,cli->cnum);
@@ -3855,7 +3855,7 @@ end a message
 ****************************************************************************/
 BOOL cli_message_end(struct cli_state *cli, int grp)
 {
-	bzero(cli->outbuf,smb_size);
+	memset(cli->outbuf, 0, smb_size);
 	set_message(cli->outbuf,1,0,True);
 	CVAL(cli->outbuf,smb_com) = SMBsendend;
 	SSVAL(cli->outbuf,smb_tid,cli->cnum);
@@ -3881,7 +3881,7 @@ query disk space
 ****************************************************************************/
 BOOL cli_dskattr(struct cli_state *cli, int *bsize, int *total, int *avail)
 {
-	bzero(cli->outbuf,smb_size);
+	memset(cli->outbuf, 0, smb_size);
 	set_message(cli->outbuf,0,0,True);
 	CVAL(cli->outbuf,smb_com) = SMBdskattr;
 	SSVAL(cli->outbuf,smb_tid,cli->cnum);
diff --git a/source/netlogond/srv_netlogon_nt.c b/source/netlogond/srv_netlogon_nt.c
index 1400db6a1ce..d45775d253c 100644
--- a/source/netlogond/srv_netlogon_nt.c
+++ b/source/netlogond/srv_netlogon_nt.c
@@ -425,7 +425,7 @@ uint32 _net_req_chal(const UNISTR2 *uni_logon_server,
 	memcpy(dc.srv_cred.challenge.data, srv_chal->data,
 	       sizeof(srv_chal->data));
 
-	bzero(dc.sess_key, sizeof(dc.sess_key));
+	ZERO_STRUCT(dc.sess_key);
 
 	/* from client / server challenges and md4 password, generate sess key */
 	cred_session_key(&(dc.clnt_chal), &(dc.srv_chal),
diff --git a/source/passdb/nispass.c b/source/passdb/nispass.c
index f554958adeb..c30242eb1ca 100644
--- a/source/passdb/nispass.c
+++ b/source/passdb/nispass.c
@@ -295,12 +295,12 @@ static BOOL add_nisp21pwd_entry(struct sam_passwd *newpwd)
 	fstring pwdlchg_t;
 	fstring pwdmchg_t;
 
-	bzero(logon_t  , sizeof(logon_t  ));
-	bzero(logoff_t , sizeof(logoff_t ));
-	bzero(kickoff_t, sizeof(kickoff_t));
-	bzero(pwdlset_t, sizeof(pwdlset_t));
-	bzero(pwdlchg_t, sizeof(pwdlchg_t));
-	bzero(pwdmchg_t, sizeof(pwdmchg_t));
+	ZERO_STRUCT(logon_t  );
+	ZERO_STRUCT(logoff_t );
+	ZERO_STRUCT(kickoff_t);
+	ZERO_STRUCT(pwdlset_t);
+	ZERO_STRUCT(pwdlchg_t);
+	ZERO_STRUCT(pwdmchg_t);
 
 	pfile = lp_smb_passwd_file();
 
diff --git a/source/passdb/passdb.c b/source/passdb/passdb.c
index 8c596f96acb..498e61acdc0 100644
--- a/source/passdb/passdb.c
+++ b/source/passdb/passdb.c
@@ -261,7 +261,7 @@ struct smb_passwd *getsmbpwuid(uid_t unix_uid)
 void pwdb_init_smb(struct smb_passwd *user)
 {
 	if (user == NULL) return;
-	bzero(user, sizeof(*user));
+	ZERO_STRUCTP(user);
 	user->pass_last_set_time    = (time_t)-1;
 	user->unix_uid = (uid_t)-1;
 	user->user_rid = 0xffffffff;
diff --git a/source/passdb/sampassdb.c b/source/passdb/sampassdb.c
index df2913a7fa7..187cc92cfad 100644
--- a/source/passdb/sampassdb.c
+++ b/source/passdb/sampassdb.c
@@ -307,7 +307,7 @@ struct sam_passwd *getsam21pwrid(uint32 rid)
 static void pwdb_init_dispinfo(struct sam_disp_info *user)
 {
 	if (user == NULL) return;
-	bzero(user, sizeof(*user));
+	ZERO_STRUCTP(user);
 	user->user_rid = 0xffffffff;
 }
 
@@ -317,7 +317,7 @@ static void pwdb_init_dispinfo(struct sam_disp_info *user)
 void pwdb_init_sam(struct sam_passwd *user)
 {
 	if (user == NULL) return;
-	bzero(user, sizeof(*user));
+	ZERO_STRUCTP(user);
 
 	init_nt_time(&user->logon_time);
 	init_nt_time(&user->logoff_time);
diff --git a/source/printing/nt_printing.c b/source/printing/nt_printing.c
index 8d55b3844ee..3368206e2b0 100644
--- a/source/printing/nt_printing.c
+++ b/source/printing/nt_printing.c
@@ -73,7 +73,7 @@ int get_ntforms(nt_forms_struct **list)
 			total = 0;
 			break;
 		}
-		bzero( (char *)&(*list)[total], sizeof(nt_forms_struct) );
+		memset( (char *)&(*list)[total], 0,  sizeof(nt_forms_struct) );
 		if ( parse_form_entry(line, &(*list)[total] ) )
 		{
 			total++;
diff --git a/source/printing/printing.c b/source/printing/printing.c
index c7f50388db8..2b5231814d0 100644
--- a/source/printing/printing.c
+++ b/source/printing/printing.c
@@ -1038,7 +1038,7 @@ int get_printqueue(int snum, connection_struct *conn, const vuser_key *key,
 			break;
 		}
 
-		bzero((char *)&(*queue)[count],sizeof(**queue));
+		memset((char *)&(*queue)[count], 0, sizeof(**queue));
 	  
 		/* parse it */
 		if (!parse_lpq_entry(snum,line,
diff --git a/source/rpc_client/cli_login.c b/source/rpc_client/cli_login.c
index 51d93d24417..1916ab5eb47 100644
--- a/source/rpc_client/cli_login.c
+++ b/source/rpc_client/cli_login.c
@@ -62,7 +62,7 @@ uint32 cli_nt_setup_creds(const char *srv_name,
 
 	/* calculate the session key */
 	cred_session_key(&clnt_chal, &srv_chal, trust_pwd, sess_key);
-	bzero(sess_key + 8, 8);
+	memset(sess_key + 8, 0,  8);
 
 	/******************* Authenticate 2 ********************/
 
diff --git a/source/rpc_client/cli_pipe_ntlmssp.c b/source/rpc_client/cli_pipe_ntlmssp.c
index 5ec8bf6c32d..cf7ea91d2d0 100644
--- a/source/rpc_client/cli_pipe_ntlmssp.c
+++ b/source/rpc_client/cli_pipe_ntlmssp.c
@@ -547,7 +547,7 @@ static BOOL create_ntlmssp_bind_cont(struct cli_connection *con,
 		a->ntlmssp_hash[256] = 0;
 		a->ntlmssp_hash[257] = 0;
 	}
-	bzero(lm_hash, sizeof(lm_hash));
+	ZERO_STRUCT(lm_hash);
 
 	prs_init(dataa, 0, 4, False);
 	ret = prs_copy(dataa, &hdra);
diff --git a/source/rpc_client/msrpc_samr.c b/source/rpc_client/msrpc_samr.c
index 541298f23bd..c1a55cf2759 100644
--- a/source/rpc_client/msrpc_samr.c
+++ b/source/rpc_client/msrpc_samr.c
@@ -1727,7 +1727,7 @@ BOOL get_samr_query_groupinfo(
 
 	if (pol_open_domain == NULL || ctr == NULL) return False;
 
-	bzero(ctr, sizeof(*ctr));
+	ZERO_STRUCTP(ctr);
 
 	/* send open domain (on group sid) */
 	if (!samr_open_group( pol_open_domain,
@@ -1760,7 +1760,7 @@ BOOL get_samr_query_aliasinfo(
 
 	if (pol_open_domain == NULL || ctr == NULL) return False;
 
-	bzero(ctr, sizeof(*ctr));
+	ZERO_STRUCTP(ctr);
 
 	/* send open domain (on alias sid) */
 	if (!samr_open_alias( pol_open_domain,
diff --git a/source/rpc_parse/parse_lsa.c b/source/rpc_parse/parse_lsa.c
index 0fdfd4f1f7a..9e8867fe581 100644
--- a/source/rpc_parse/parse_lsa.c
+++ b/source/rpc_parse/parse_lsa.c
@@ -1540,7 +1540,7 @@ static BOOL lsa_io_dom_query(char *desc,  DOM_QUERY *d_q, prs_struct *ps, int de
 	}
 	else
 	{
-		bzero(&(d_q->dom_sid), sizeof(d_q->dom_sid));
+		ZERO_STRUCT(d_q->dom_sid);
 	}
 
 	return True;
diff --git a/source/rpc_parse/parse_misc.c b/source/rpc_parse/parse_misc.c
index 7f930c9d9c1..444abac2cec 100644
--- a/source/rpc_parse/parse_misc.c
+++ b/source/rpc_parse/parse_misc.c
@@ -781,7 +781,7 @@ BOOL smb_io_buffer2(char *desc,  BUFFER2 *buf2, uint32 buffer, prs_struct *ps, i
 	{
 		prs_debug(ps, depth, desc, "smb_io_buffer2 - NULL");
 		depth++;
-		bzero(buf2, sizeof(*buf2));
+		ZERO_STRUCTP(buf2);
 	}
 
 	return True;
@@ -879,7 +879,7 @@ BOOL smb_io_string2(char *desc,  STRING2 *str2, uint32 buffer, prs_struct *ps, i
 	{
 		prs_debug(ps, depth, desc, "smb_io_string2 - NULL");
 		depth++;
-		bzero(str2, sizeof(*str2));
+		ZERO_STRUCTP(str2);
 	}
 
 	return True;
@@ -928,7 +928,7 @@ BOOL smb_io_unistr2(char *desc,  UNISTR2 *uni2, uint32 buffer, prs_struct *ps, i
 	{
 		prs_debug(ps, depth, desc, "smb_io_unistr2 - NULL");
 		depth++;
-		bzero(uni2, sizeof(*uni2));
+		ZERO_STRUCTP(uni2);
 	}
 
 	return True;
diff --git a/source/rpc_parse/parse_net.c b/source/rpc_parse/parse_net.c
index be09d9e7202..46daaedfe5b 100644
--- a/source/rpc_parse/parse_net.c
+++ b/source/rpc_parse/parse_net.c
@@ -238,7 +238,7 @@ BOOL make_owf_info(OWF_INFO *hash, const uint8 data[16])
 	}
 	else
 	{
-		bzero(hash->data, sizeof(hash->data));
+		ZERO_STRUCT(hash->data);
 	}
 
 	return True;
@@ -1357,7 +1357,7 @@ BOOL make_net_user_info2W(NET_USER_INFO_2 * usr,
 	}
 	else
 	{
-		bzero(usr->user_sess_key, sizeof(usr->user_sess_key));
+		ZERO_STRUCT(usr->user_sess_key);
 	}
 
 	make_uni_hdr(&(usr->hdr_logon_srv), len_logon_srv);
@@ -1365,7 +1365,7 @@ BOOL make_net_user_info2W(NET_USER_INFO_2 * usr,
 
 	usr->buffer_dom_id = dom_sid ? 1 : 0;	/* yes, put a domain SID in */
 
-	bzero(usr->padding, sizeof(usr->padding));
+	ZERO_STRUCT(usr->padding);
 	if (padding != NULL)
 	{
 		memcpy(usr->padding, padding, 8);
@@ -1467,7 +1467,7 @@ BOOL make_net_user_info2(NET_USER_INFO_2 * usr,
 	}
 	else
 	{
-		bzero(usr->user_sess_key, sizeof(usr->user_sess_key));
+		ZERO_STRUCT(usr->user_sess_key);
 	}
 
 	make_uni_hdr(&(usr->hdr_logon_srv), len_logon_srv);
@@ -1475,7 +1475,7 @@ BOOL make_net_user_info2(NET_USER_INFO_2 * usr,
 
 	usr->buffer_dom_id = dom_sid ? 1 : 0;	/* yes, we're bothering to put a domain SID in */
 
-	bzero(usr->padding, sizeof(usr->padding));
+	ZERO_STRUCT(usr->padding);
 	if (padding != NULL)
 	{
 		memcpy(usr->padding, padding, 8);
@@ -1732,7 +1732,7 @@ BOOL make_net_user_info3W(NET_USER_INFO_3 * usr,
 	}
 	else
 	{
-		bzero(usr->user_sess_key, sizeof(usr->user_sess_key));
+		ZERO_STRUCT(usr->user_sess_key);
 	}
 
 	make_uni_hdr(&(usr->hdr_logon_srv), len_logon_srv);
@@ -1740,7 +1740,7 @@ BOOL make_net_user_info3W(NET_USER_INFO_3 * usr,
 
 	usr->buffer_dom_id = dom_sid ? 1 : 0;	/* yes, put a domain SID in */
 
-	bzero(usr->padding, sizeof(usr->padding));
+	ZERO_STRUCT(usr->padding);
 	if (padding != NULL)
 	{
 		memcpy(usr->padding, padding, 8);
@@ -1850,7 +1850,7 @@ BOOL make_net_user_info3(NET_USER_INFO_3 * usr,
 	}
 	else
 	{
-		bzero(usr->user_sess_key, sizeof(usr->user_sess_key));
+		ZERO_STRUCT(usr->user_sess_key);
 	}
 
 	make_uni_hdr(&(usr->hdr_logon_srv), len_logon_srv);
@@ -1858,7 +1858,7 @@ BOOL make_net_user_info3(NET_USER_INFO_3 * usr,
 
 	usr->buffer_dom_id = dom_sid ? 1 : 0;	/* yes, we're bothering to put a domain SID in */
 
-	bzero(usr->padding, sizeof(usr->padding));
+	ZERO_STRUCT(usr->padding);
 	if (padding != NULL)
 	{
 		memcpy(usr->padding, padding, 8);
diff --git a/source/rpc_parse/parse_prs.c b/source/rpc_parse/parse_prs.c
index f04c5420e50..26db987a5da 100644
--- a/source/rpc_parse/parse_prs.c
+++ b/source/rpc_parse/parse_prs.c
@@ -158,7 +158,7 @@ BOOL prs_alloc_data(prs_struct * buf, int size)
 		return False;
 	}
 
-	bzero(buf->data, buf->data_size);
+	memset(buf->data, 0,  buf->data_size);
 	buf->end = buf->start + size;
 
 	CHECK_STRUCT(buf);
diff --git a/source/rpc_parse/parse_samr.c b/source/rpc_parse/parse_samr.c
index 04890a23b7c..cdda441980b 100644
--- a/source/rpc_parse/parse_samr.c
+++ b/source/rpc_parse/parse_samr.c
@@ -4957,7 +4957,7 @@ BOOL make_sam_user_info12(SAM_USER_INFO_12 * usr,
 
 	if (lm_pwd == NULL)
 	{
-		bzero(usr->lm_pwd, sizeof(usr->lm_pwd));
+		ZERO_STRUCT(usr->lm_pwd);
 		usr->lm_pwd_active = 0;
 	}
 	else
@@ -4968,7 +4968,7 @@ BOOL make_sam_user_info12(SAM_USER_INFO_12 * usr,
 
 	if (nt_pwd == NULL)
 	{
-		bzero(usr->nt_pwd, sizeof(usr->nt_pwd));
+		ZERO_STRUCT(usr->nt_pwd);
 		usr->nt_pwd_active = 0;
 	}
 	else
@@ -5057,20 +5057,20 @@ BOOL make_sam_user_info11(SAM_USER_INFO_11 * usr,
 	len_mach_acct = strlen(mach_acct);
 
 	memcpy(&(usr->expiry), expiry, sizeof(usr->expiry));	/* expiry time or something? */
-	bzero(usr->padding_1, sizeof(usr->padding_1));	/* 0 - padding 24 bytes */
+	ZERO_STRUCT(usr->padding_1);	/* 0 - padding 24 bytes */
 
 	make_uni_hdr(&(usr->hdr_mach_acct), len_mach_acct);	/* unicode header for machine account */
 	usr->padding_2 = 0;	/* 0 - padding 4 bytes */
 
 	usr->ptr_1 = 1;		/* pointer */
-	bzero(usr->padding_3, sizeof(usr->padding_3));	/* 0 - padding 32 bytes */
+	ZERO_STRUCT(usr->padding_3);	/* 0 - padding 32 bytes */
 	usr->padding_4 = 0;	/* 0 - padding 4 bytes */
 
 	usr->ptr_2 = 1;		/* pointer */
 	usr->padding_5 = 0;	/* 0 - padding 4 bytes */
 
 	usr->ptr_3 = 1;		/* pointer */
-	bzero(usr->padding_6, sizeof(usr->padding_6));	/* 0 - padding 32 bytes */
+	ZERO_STRUCT(usr->padding_6);	/* 0 - padding 32 bytes */
 
 	usr->rid_user = rid_user;
 	usr->rid_group = rid_group;
@@ -5081,7 +5081,7 @@ BOOL make_sam_user_info11(SAM_USER_INFO_11 * usr,
 	usr->unknown_4 = 0x003f;	/* 0x003f      - 16 bit unknown */
 	usr->unknown_5 = 0x003c;	/* 0x003c      - 16 bit unknown */
 
-	bzero(usr->padding_7, sizeof(usr->padding_7));	/* 0 - padding 16 bytes */
+	ZERO_STRUCT(usr->padding_7);	/* 0 - padding 16 bytes */
 	usr->padding_8 = 0;	/* 0 - padding 4 bytes */
 
 	make_unistr2(&(usr->uni_mach_acct), mach_acct, len_mach_acct);	/* unicode string for machine account */
@@ -5248,8 +5248,8 @@ BOOL make_sam_user_info23W(SAM_USER_INFO_23 * usr, const NTTIME * logon_time,	/*
 	make_uni_hdr(&(usr->hdr_unknown_str), len_unknown_str);
 	make_uni_hdr(&(usr->hdr_munged_dial), len_munged_dial);
 
-	bzero(usr->nt_pwd, sizeof(usr->nt_pwd));
-	bzero(usr->lm_pwd, sizeof(usr->lm_pwd));
+	ZERO_STRUCT(usr->nt_pwd);
+	ZERO_STRUCT(usr->lm_pwd);
 
 	usr->user_rid = user_rid;	/* 0x0000 0000 */
 	usr->group_rid = group_rid;
@@ -5259,7 +5259,7 @@ BOOL make_sam_user_info23W(SAM_USER_INFO_23 * usr, const NTTIME * logon_time,	/*
 	usr->logon_divs = logon_divs;	/* should be 168 (hours/week) */
 	usr->ptr_logon_hrs = hrs ? 1 : 0;
 
-	bzero(usr->padding1, sizeof(usr->padding1));
+	ZERO_STRUCT(usr->padding1);
 
 	usr->unknown_5 = unknown_5;	/* 0x0001 0000 */
 
@@ -5344,8 +5344,8 @@ BOOL make_sam_user_info23A(SAM_USER_INFO_23 * usr, NTTIME * logon_time,	/* all z
 	make_uni_hdr(&(usr->hdr_unknown_str), len_unknown_str);
 	make_uni_hdr(&(usr->hdr_munged_dial), len_munged_dial);
 
-	bzero(usr->nt_pwd, sizeof(usr->nt_pwd));
-	bzero(usr->lm_pwd, sizeof(usr->lm_pwd));
+	ZERO_STRUCT(usr->nt_pwd);
+	ZERO_STRUCT(usr->lm_pwd);
 
 	usr->user_rid = user_rid;	/* 0x0000 0000 */
 	usr->group_rid = group_rid;
@@ -5355,7 +5355,7 @@ BOOL make_sam_user_info23A(SAM_USER_INFO_23 * usr, NTTIME * logon_time,	/* all z
 	usr->logon_divs = logon_divs;	/* should be 168 (hours/week) */
 	usr->ptr_logon_hrs = hrs ? 1 : 0;
 
-	bzero(usr->padding1, sizeof(usr->padding1));
+	ZERO_STRUCT(usr->padding1);
 
 	usr->unknown_5 = unknown_5;	/* 0x0001 0000 */
 
@@ -5563,7 +5563,7 @@ BOOL make_sam_user_info21W(SAM_USER_INFO_21 * usr,
 
 	if (lm_pwd == NULL)
 	{
-		bzero(usr->lm_pwd, sizeof(usr->lm_pwd));
+		ZERO_STRUCT(usr->lm_pwd);
 	}
 	else
 	{
@@ -5571,7 +5571,7 @@ BOOL make_sam_user_info21W(SAM_USER_INFO_21 * usr,
 	}
 	if (nt_pwd == NULL)
 	{
-		bzero(usr->nt_pwd, sizeof(usr->nt_pwd));
+		ZERO_STRUCT(usr->nt_pwd);
 	}
 	else
 	{
@@ -5587,7 +5587,7 @@ BOOL make_sam_user_info21W(SAM_USER_INFO_21 * usr,
 	usr->ptr_logon_hrs = hrs ? 1 : 0;
 	usr->unknown_5 = unknown_5;	/* 0x0002 0000 */
 
-	bzero(usr->padding1, sizeof(usr->padding1));
+	ZERO_STRUCT(usr->padding1);
 
 	copy_unistr2(&(usr->uni_user_name), user_name);
 	copy_unistr2(&(usr->uni_full_name), full_name);
@@ -5677,8 +5677,8 @@ BOOL make_sam_user_info21A(SAM_USER_INFO_21 * usr,
 	make_uni_hdr(&(usr->hdr_unknown_str), len_unknown_str);
 	make_uni_hdr(&(usr->hdr_munged_dial), len_munged_dial);
 
-	bzero(usr->nt_pwd, sizeof(usr->nt_pwd));
-	bzero(usr->lm_pwd, sizeof(usr->lm_pwd));
+	ZERO_STRUCT(usr->nt_pwd);
+	ZERO_STRUCT(usr->lm_pwd);
 
 	usr->user_rid = user_rid;
 	usr->group_rid = group_rid;
@@ -5689,7 +5689,7 @@ BOOL make_sam_user_info21A(SAM_USER_INFO_21 * usr,
 	usr->ptr_logon_hrs = hrs ? 1 : 0;
 	usr->unknown_5 = unknown_5;	/* 0x0002 0000 */
 
-	bzero(usr->padding1, sizeof(usr->padding1));
+	ZERO_STRUCT(usr->padding1);
 
 	make_unistr2(&(usr->uni_user_name), user_name, len_user_name);
 	make_unistr2(&(usr->uni_full_name), full_name, len_full_name);
diff --git a/source/rpc_parse/parse_svc.c b/source/rpc_parse/parse_svc.c
index b924b0bcaaf..755dba86a82 100644
--- a/source/rpc_parse/parse_svc.c
+++ b/source/rpc_parse/parse_svc.c
@@ -478,7 +478,7 @@ BOOL svc_io_r_enum_svcs_status(char *desc, SVC_R_ENUM_SVCS_STATUS *svc, prs_stru
 			return False;
 		}
 
-		bzero(svc->svcs, svc->num_svcs * sizeof(ENUM_SRVC_STATUS));
+		memset(svc->svcs, 0,  svc->num_svcs * sizeof(ENUM_SRVC_STATUS));
 
 		for (i = 0; i < svc->num_svcs; i++)
 		{
diff --git a/source/rpcclient/cmd_brs.c b/source/rpcclient/cmd_brs.c
index 00eeebaf4b8..d2b3ab68ea7 100644
--- a/source/rpcclient/cmd_brs.c
+++ b/source/rpcclient/cmd_brs.c
@@ -41,7 +41,7 @@ void cmd_brs_query_info(struct client_info *info, int argc, char *argv[])
 
 	BOOL res = True;
 
-	bzero(&ctr, sizeof(ctr));
+	ZERO_STRUCT(ctr);
 
 	fstrcpy(dest_brs, "\\\\");
 	fstrcat(dest_brs, info->dest_host);
diff --git a/source/rpcclient/cmd_wkssvc.c b/source/rpcclient/cmd_wkssvc.c
index c4336fd798e..605a9bee4fe 100644
--- a/source/rpcclient/cmd_wkssvc.c
+++ b/source/rpcclient/cmd_wkssvc.c
@@ -40,7 +40,7 @@ void cmd_wks_query_info(struct client_info *info, int argc, char *argv[])
 
 	BOOL res = True;
 
-	bzero(&ctr, sizeof(ctr));
+	ZERO_STRUCT(ctr);
 
 	fstrcpy(dest_wks, "\\\\");
 	fstrcat(dest_wks, info->dest_host);
diff --git a/source/samrd/srv_samr_passdb.c b/source/samrd/srv_samr_passdb.c
index a5491a8a1e2..275a6150911 100644
--- a/source/samrd/srv_samr_passdb.c
+++ b/source/samrd/srv_samr_passdb.c
@@ -127,7 +127,7 @@ static BOOL get_sampwd_entries(SAM_USER_INFO_21 * pw_buf,
 		make_uni_hdr(&(pw_buf[(*num_entries)].hdr_user_name),
 			     user_name_len);
 		pw_buf[(*num_entries)].user_rid = pwd->user_rid;
-		bzero(pw_buf[(*num_entries)].nt_pwd, 16);
+		memset(pw_buf[(*num_entries)].nt_pwd, 0,  16);
 
 		/* Now check if the NT compatible password is available. */
 		if (pwd->smb_nt_passwd != NULL)
diff --git a/source/samrd/srv_samr_sam_tdb.c b/source/samrd/srv_samr_sam_tdb.c
index d8379100629..fe3c5d180b0 100644
--- a/source/samrd/srv_samr_sam_tdb.c
+++ b/source/samrd/srv_samr_sam_tdb.c
@@ -250,7 +250,7 @@ uint32 _samr_close(POLICY_HND *hnd)
 	/* close the policy handle */
 	if (close_policy_hnd(get_global_hnd_cache(), hnd))
 	{
-		bzero(hnd, sizeof(*hnd));
+		ZERO_STRUCTP(hnd);
 		return NT_STATUS_NOPROBLEMO;
 	}
 	return NT_STATUS_OBJECT_NAME_INVALID;
diff --git a/source/smbd/ipc.c b/source/smbd/ipc.c
index 68b449c7329..278869d4946 100644
--- a/source/smbd/ipc.c
+++ b/source/smbd/ipc.c
@@ -393,7 +393,7 @@ int reply_trans(connection_struct *conn, char *inbuf,char *outbuf, int size, int
 	int dsoff = SVAL(inbuf,smb_vwv12);
 	int suwcnt = CVAL(inbuf,smb_vwv13);
 
-	bzero(name, sizeof(name));
+	ZERO_STRUCT(name);
 	fstrcpy(name,smb_buf(inbuf));
 
 	if (dscnt > tdscnt || pscnt > tpscnt) {
diff --git a/source/smbd/lanman.c b/source/smbd/lanman.c
index 9f1d46b2de7..0096499237b 100644
--- a/source/smbd/lanman.c
+++ b/source/smbd/lanman.c
@@ -544,7 +544,7 @@ static void fill_printq_info(connection_struct *conn, const vuser_key *key,
       return;
     }
 
-    bzero(p, 8192*sizeof(char));
+    memset(p, 0,  8192*sizeof(char));
     q=p;
 
     /* lookup the long printer driver name in the file description */
@@ -699,8 +699,8 @@ static BOOL api_DosPrintQGetInfo(connection_struct *conn,
 
   VUSER_KEY;
   
-  bzero(&status,sizeof(status));
-  bzero(&desc,sizeof(desc));
+  ZERO_STRUCT(status);
+  ZERO_STRUCT(desc);
  
   p = skip_string(p,1);
   uLevel = SVAL(p,0);
@@ -799,7 +799,7 @@ static BOOL api_DosPrintQEnum(connection_struct *conn, uint16 vuid, char* param,
   int queuecnt, subcnt=0, succnt=0;
 	VUSER_KEY;
  
-  bzero(&desc,sizeof(desc));
+  ZERO_STRUCT(desc);
 
   DEBUG(3,("DosPrintQEnum uLevel=%d\n",uLevel));
  
@@ -948,7 +948,7 @@ static int get_server_info(uint32 servertype,
       (*servers) = (struct srv_info_struct *)
 	Realloc(*servers,sizeof(**servers)*alloced);
       if (!(*servers)) return(0);
-      bzero((char *)((*servers)+count),sizeof(**servers)*(alloced-count));
+      memset((char *)((*servers)+count), 0, sizeof(**servers)*(alloced-count));
     }
     s = &(*servers)[count];
     
@@ -1188,7 +1188,7 @@ static BOOL api_RNetServerEnum(connection_struct *conn, uint16 vuid, char *param
 
   *rdata_len = fixed_len + string_len;
   *rdata = REALLOC(*rdata,*rdata_len);
-  bzero(*rdata,*rdata_len);
+  memset(*rdata, 0, *rdata_len);
   
   p2 = (*rdata) + fixed_len;	/* auxilliary data (strings) will go here */
   p = *rdata;
@@ -2534,7 +2534,7 @@ static BOOL api_WWkstaUserLogon(connection_struct *conn,uint16 vuid, char *param
   uLevel = SVAL(p,0);
   name = p + 2;
 
-  bzero(&desc,sizeof(desc));
+  ZERO_STRUCT(desc);
 
   DEBUG(3,("WWkstaUserLogon uLevel=%d name=%s\n",uLevel,name));
 
@@ -2649,8 +2649,8 @@ static BOOL api_WPrintJobGetInfo(connection_struct *conn,uint16 vuid, char *para
 
   uLevel = SVAL(p,2);
 
-  bzero(&desc,sizeof(desc));
-  bzero(&status,sizeof(status));
+  ZERO_STRUCT(desc);
+  ZERO_STRUCT(status);
 
   DEBUG(3,("WPrintJobGetInfo uLevel=%d uJobId=0x%X\n",uLevel,SVAL(p,0)));
 
@@ -2711,8 +2711,8 @@ static BOOL api_WPrintJobEnumerate(connection_struct *conn,uint16 vuid, char *pa
   print_status_struct status;
 	VUSER_KEY;
 
-  bzero(&desc,sizeof(desc));
-  bzero(&status,sizeof(status));
+  ZERO_STRUCT(desc);
+  ZERO_STRUCT(status);
 
   p = skip_string(p,1);
   uLevel = SVAL(p,0);
@@ -2824,7 +2824,7 @@ static BOOL api_WPrintDestGetInfo(connection_struct *conn,uint16 vuid, char *par
   struct pack_desc desc;
   int snum;
 
-  bzero(&desc,sizeof(desc));
+  ZERO_STRUCT(desc);
 
   p = skip_string(p,1);
   uLevel = SVAL(p,0);
@@ -2883,7 +2883,7 @@ static BOOL api_WPrintDestEnum(connection_struct *conn,uint16 vuid, char *param,
   struct pack_desc desc;
   int services = lp_numservices();
 
-  bzero(&desc,sizeof(desc));
+  ZERO_STRUCT(desc);
 
   uLevel = SVAL(p,0);
 
@@ -2938,7 +2938,7 @@ static BOOL api_WPrintDriverEnum(connection_struct *conn,uint16 vuid, char *para
   int succnt;
   struct pack_desc desc;
 
-  bzero(&desc,sizeof(desc));
+  ZERO_STRUCT(desc);
 
   uLevel = SVAL(p,0);
 
@@ -2982,7 +2982,7 @@ static BOOL api_WPrintQProcEnum(connection_struct *conn,uint16 vuid, char *param
   int succnt;
   struct pack_desc desc;
 
-  bzero(&desc,sizeof(desc));
+  ZERO_STRUCT(desc);
 
   uLevel = SVAL(p,0);
 
@@ -3027,7 +3027,7 @@ static BOOL api_WPrintPortEnum(connection_struct *conn,uint16 vuid, char *param,
   int succnt;
   struct pack_desc desc;
 
-  bzero(&desc,sizeof(desc));
+  ZERO_STRUCT(desc);
 
   uLevel = SVAL(p,0);
 
@@ -3038,7 +3038,7 @@ static BOOL api_WPrintPortEnum(connection_struct *conn,uint16 vuid, char *param,
   if (uLevel != 0 || strcmp(str2,"B9") != 0) return False;
 
   if (mdrcnt > 0) *rdata = REALLOC(*rdata,mdrcnt);
-  bzero(&desc,sizeof(desc));
+  ZERO_STRUCT(desc);
   desc.base = *rdata;
   desc.buflen = mdrcnt;
   desc.format = str2;
@@ -3180,8 +3180,8 @@ int api_reply(connection_struct *conn,uint16 vuid,char *outbuf,char *data,char *
         break;
       }
 
-  rdata = (char *)malloc(1024); if (rdata) bzero(rdata,1024);
-  rparam = (char *)malloc(1024); if (rparam) bzero(rparam,1024);
+  rdata = (char *)malloc(1024); if (rdata) memset(rdata, 0, 1024);
+  rparam = (char *)malloc(1024); if (rparam) memset(rparam, 0, 1024);
 
   if (!rdata || !rparam) {
     DEBUG(0,("api_reply: malloc fail !\n"));
diff --git a/source/smbd/mangle.c b/source/smbd/mangle.c
index b829746a326..6f63760819c 100644
--- a/source/smbd/mangle.c
+++ b/source/smbd/mangle.c
@@ -148,7 +148,7 @@ static void init_chartest( void )
   char          *illegalchars = "*\\/?<>|\":";
   unsigned char *s;
   
-  bzero( (char *)chartest, 256 );
+  memset( (char *)chartest, 0,  256 );
 
   for( s = (unsigned char *)illegalchars; *s; s++ )
     chartest[*s] = ILLEGAL_MASK;
diff --git a/source/smbd/oplock.c b/source/smbd/oplock.c
index ec8b3da2616..48d92c35699 100644
--- a/source/smbd/oplock.c
+++ b/source/smbd/oplock.c
@@ -541,7 +541,7 @@ oplocks. Returning success.\n"));
     /* Send the message back after OR'ing in the 'REPLY' bit. */
     SSVAL(msg_start,OPBRK_MESSAGE_CMD_OFFSET,OPLOCK_BREAK_CMD | CMD_REPLY);
 
-    bzero((char *)&toaddr,sizeof(toaddr));
+    ZERO_STRUCT(toaddr);
     toaddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
     toaddr.sin_port = htons(from_port);
     toaddr.sin_family = AF_INET;
@@ -663,7 +663,7 @@ static BOOL oplock_break(SMB_DEV_T dev, SMB_INO_T inode, struct timeval *tval)
   }
 
   /* Prepare the SMBlockingX message. */
-  bzero(outbuf,smb_size);
+  memset(outbuf, 0, smb_size);
   set_message(outbuf,8,0,True);
 
   SCVAL(outbuf,smb_com,SMBlockingX);
@@ -883,7 +883,7 @@ should be %d\n", pid, share_entry->op_port, global_oplock_port));
 #endif /* LARGE_SMB_INO_T */
 
   /* set the address and port */
-  bzero((char *)&addr_out,sizeof(addr_out));
+  ZERO_STRUCT(addr_out);
   addr_out.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
   addr_out.sin_port = htons( share_entry->op_port );
   addr_out.sin_family = AF_INET;
diff --git a/source/smbd/process.c b/source/smbd/process.c
index 0af59cd345f..bba218a73e8 100644
--- a/source/smbd/process.c
+++ b/source/smbd/process.c
@@ -646,7 +646,7 @@ char *smb_fn_name(int type)
 
 void construct_reply_common(char *inbuf,char *outbuf)
 {
-  bzero(outbuf,smb_size);
+  memset(outbuf, 0, smb_size);
 
   set_message(outbuf,0,0,True);
   CVAL(outbuf,smb_com) = CVAL(inbuf,smb_com);
diff --git a/source/smbd/reply.c b/source/smbd/reply.c
index f573307b0f0..508f76a2a65 100644
--- a/source/smbd/reply.c
+++ b/source/smbd/reply.c
@@ -78,7 +78,7 @@ int reply_special(char *inbuf, char *outbuf)
 
 	*name1 = *name2 = 0;
 
-	bzero(outbuf, smb_size);
+	memset(outbuf, 0,  smb_size);
 
 	smb_setlen(outbuf, 0);
 
@@ -1099,7 +1099,7 @@ int reply_search(connection_struct * conn, char *inbuf, char *outbuf,
 
 		if (strlen(directory) == 0)
 			pstrcpy(directory, "./");
-		bzero(status, 21);
+		memset(status, 0,  21);
 		CVAL(status, 0) = dirtype;
 	}
 	else
diff --git a/source/smbd/trans2.c b/source/smbd/trans2.c
index 1a8fdd12962..21ec4c25178 100644
--- a/source/smbd/trans2.c
+++ b/source/smbd/trans2.c
@@ -273,7 +273,7 @@ static int call_trans2open(connection_struct *conn, char *inbuf, char *outbuf,
   if(params == NULL)
     return(ERROR(ERRDOS,ERRnomem));
 
-  bzero(params,28);
+  memset(params, 0, 28);
   SSVAL(params,0,fsp->fnum);
   SSVAL(params,2,fmode);
   put_dos_date2(params,4, mtime);
@@ -709,7 +709,7 @@ static int call_trans2findfirst(connection_struct *conn,
   pdata = *ppdata = Realloc(*ppdata, max_data_bytes + 1024);
   if(!*ppdata)
     return(ERROR(ERRDOS,ERRnomem));
-  bzero(pdata,max_data_bytes);
+  memset(pdata, 0, max_data_bytes);
 
   /* Realloc the params space */
   params = *pparams = Realloc(*pparams, 10);
@@ -892,7 +892,7 @@ resume_key = %d resume name = %s continue=%d level = %d\n",
   pdata = *ppdata = Realloc( *ppdata, max_data_bytes + 1024);
   if(!*ppdata)
     return(ERROR(ERRDOS,ERRnomem));
-  bzero(pdata,max_data_bytes);
+  memset(pdata, 0, max_data_bytes);
 
   /* Realloc the params space */
   params = *pparams = Realloc(*pparams, 6*SIZEOFWORD);
@@ -1088,7 +1088,7 @@ static int call_trans2qfsinfo(connection_struct *conn,
     return (ERROR(ERRSRV,ERRinvdevice));
   }
 
-  pdata = *ppdata = Realloc(*ppdata, 1024); bzero(pdata,1024);
+  pdata = *ppdata = Realloc(*ppdata, 1024); memset(pdata, 0, 1024);
 
   switch (info_level) 
   {
@@ -1336,7 +1336,7 @@ static int call_trans2qfilepathinfo(connection_struct *conn,
   /* from now on we only want the part after the / */
   fname = p;
   
-  params = *pparams = Realloc(*pparams,2); bzero(params,2);
+  params = *pparams = Realloc(*pparams,2); memset(params, 0, 2);
   data_size = 1024;
   pdata = *ppdata = Realloc(*ppdata, data_size); 
 
@@ -1346,7 +1346,7 @@ static int call_trans2qfilepathinfo(connection_struct *conn,
     return(ERROR(ERRDOS,ERROR_EAS_NOT_SUPPORTED));
   }
 
-  bzero(pdata,data_size);
+  memset(pdata, 0, data_size);
 
   switch (info_level) 
     {
@@ -2143,7 +2143,7 @@ static int call_trans2getdfsreferral(connection_struct *conn,
 
 	/* allocate memory for the reply data */	
 	pdata = *ppdata = Realloc(*ppdata, bytesreq + 1024); 
-	bzero(*ppdata, bytesreq+22);
+	memset(*ppdata, 0,  bytesreq+22);
 
 	pdata = *ppdata;
 	pheader = pdata;