From 8719c27726d3412edd0781beb956f48f76a62fb6 Mon Sep 17 00:00:00 2001
From: Herb Lewis <herb@samba.org>
Date: Wed, 11 Oct 2000 05:31:39 +0000
Subject: changes to sync with 2.2. tree

.cvsignore              remove config.h - not in this directory
include/profile.h       profile changes
lib/messages.c          added message to return debug level
libsmb/clierror.c       cast to get rid of compiler warning
libsmb/smbencrypt.c     cast to get rid of compiler warning
profile/profile.c       add flush profile stats changes for profile struct
rpc_parse/parse_samr.c  fix for compiler warning
rpc_server/srv_samr.c   cast to get rid of compiler warning
smbd/ipc.c              profile stats
message.c               profile stats
smbd/negprot.c          profile stats
smbd/nttrans.c          profile stats
smbd/trans2.c           profile stats
utils/smbcontrol.c      new flush stats command
(This used to be commit bbb24daa25dca4e4b6b1f8942cd84ee3aa1bed8e)
---
 source3/libsmb/clierror.c   | 2 +-
 source3/libsmb/smbencrypt.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/libsmb')

diff --git a/source3/libsmb/clierror.c b/source3/libsmb/clierror.c
index 66bf83cfc5..4c6d9a49f2 100644
--- a/source3/libsmb/clierror.c
+++ b/source3/libsmb/clierror.c
@@ -96,7 +96,7 @@ char *cli_errstr(struct cli_state *cli)
 
 	if (nt_rpc_error)
 	{
-		char *nt_msg = get_nt_error_msg(nt_rpc_error);
+		char *nt_msg = (char *)get_nt_error_msg(nt_rpc_error);
 
 		if (nt_msg == NULL)
 		{
diff --git a/source3/libsmb/smbencrypt.c b/source3/libsmb/smbencrypt.c
index 16f2493947..371e279ffd 100644
--- a/source3/libsmb/smbencrypt.c
+++ b/source3/libsmb/smbencrypt.c
@@ -255,7 +255,7 @@ BOOL decode_pw_buffer(const char buffer[516], char *new_pwrd,
 	dump_data(100, buffer, 516);
 #endif
 
-	if ((*new_pw_len) < 0 || (*new_pw_len) > new_pwrd_size - 1) {
+	if (((int)*new_pw_len) < 0 || (*new_pw_len) > new_pwrd_size - 1) {
 		DEBUG(0, ("decode_pw_buffer: incorrect password length (%d).\n", (*new_pw_len)));
 		return False;
 	}
-- 
cgit