summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorRichard Sharpe <sharpe@samba.org>1998-09-26 00:41:20 +0000
committerRichard Sharpe <sharpe@samba.org>1998-09-26 00:41:20 +0000
commit1ea570da834fa72c88dd35a86fdf68ae5ecbeb19 (patch)
tree855795a3af97e4042601cb49c0aba45896635dbe /source3
parent5f7ee360567a6b4e1a6f43ff01da057d2998fef8 (diff)
downloadsamba-1ea570da834fa72c88dd35a86fdf68ae5ecbeb19.tar.gz
samba-1ea570da834fa72c88dd35a86fdf68ae5ecbeb19.tar.bz2
samba-1ea570da834fa72c88dd35a86fdf68ae5ecbeb19.zip
Small update to clitar.c to omit warnings about servers not
letting us change the date unless tar_real_noisy is True. Also updated a few places where variables are declared but not set. (This used to be commit b46f1024c939ee9ecb8deb9c844acbd4b5f109c6)
Diffstat (limited to 'source3')
-rw-r--r--source3/client/clitar.c9
-rw-r--r--source3/rpc_server/srv_samr.c2
-rw-r--r--source3/smbd/blocking.c6
3 files changed, 9 insertions, 8 deletions
diff --git a/source3/client/clitar.c b/source3/client/clitar.c
index 4d7a2cf043..afcd4b9f1d 100644
--- a/source3/client/clitar.c
+++ b/source3/client/clitar.c
@@ -106,7 +106,7 @@ BOOL tar_system=True;
BOOL tar_hidden=True;
/* Be noisy - make a catalogue */
BOOL tar_noisy=True;
-BOOL tar_real_noisy=True;
+BOOL tar_real_noisy=False; /* Don't want to be really noisy by default */
char tar_type='\0';
static char **cliplist=NULL;
@@ -1723,9 +1723,10 @@ static int get_file(file_info2 finfo, char * inbuf, char * outbuf)
if (!do_setrtime(finfo.name, finfo.mtime, True)) {
- DEBUG(0, ("Could not set time on file: %s\n", finfo.name));
- /*return(False); */ /* Ignore, as Win95 does not allow changes */
-
+ if (tar_real_noisy) {
+ DEBUG(0, ("Could not set time on file: %s\n", finfo.name));
+ /*return(False); */ /* Ignore, as Win95 does not allow changes */
+ }
}
ntarf++;
diff --git a/source3/rpc_server/srv_samr.c b/source3/rpc_server/srv_samr.c
index 2c6e34801a..a5684c8d86 100644
--- a/source3/rpc_server/srv_samr.c
+++ b/source3/rpc_server/srv_samr.c
@@ -954,7 +954,7 @@ static void samr_reply_query_userinfo(SAMR_Q_QUERY_USERINFO *q_u,
void *info = NULL;
uint32 status = 0x0;
- uint32 rid;
+ uint32 rid = 0x0;
int obj_idx;
DEBUG(5,("samr_reply_query_userinfo: %d\n", __LINE__));
diff --git a/source3/smbd/blocking.c b/source3/smbd/blocking.c
index 27a5183952..32b6d010a4 100644
--- a/source3/smbd/blocking.c
+++ b/source3/smbd/blocking.c
@@ -195,7 +195,7 @@ static void reply_lockingX_error(blocking_lock_record *blr, int eclass, int32 ec
files_struct *fsp = blr->fsp;
connection_struct *conn = conn_find(SVAL(inbuf,smb_tid));
uint16 num_ulocks = SVAL(inbuf,smb_vwv6);
- SMB_OFF_T count, offset;
+ SMB_OFF_T count = (SMB_OFF_T) 0, offset = (SMB_OFF_T) 0;
unsigned char locktype = CVAL(inbuf,smb_vwv3);
BOOL large_file_format = (locktype & LOCKING_ANDX_LARGE_FILES);
char *data;
@@ -329,7 +329,7 @@ static BOOL process_lock(blocking_lock_record *blr)
char *outbuf = OutBuffer;
char *inbuf = blr->inbuf;
int outsize;
- SMB_OFF_T count,offset;
+ SMB_OFF_T count = 0, offset = 0;
int eclass;
uint32 ecode;
connection_struct *conn = conn_find(SVAL(inbuf,smb_tid));
@@ -387,7 +387,7 @@ static BOOL process_lockingX(blocking_lock_record *blr)
connection_struct *conn = conn_find(SVAL(inbuf,smb_tid));
uint16 num_ulocks = SVAL(inbuf,smb_vwv6);
uint16 num_locks = SVAL(inbuf,smb_vwv7);
- SMB_OFF_T count, offset;
+ SMB_OFF_T count = 0, offset = 0;
BOOL large_file_format = (locktype & LOCKING_ANDX_LARGE_FILES);
char *data;
int eclass=0;