From fbdcf2663b56007a438ac4f0d8d82436b1bfe688 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Tue, 11 Jul 2006 18:01:26 +0000
Subject: r16945: Sync trunk -> 3.0 for 3.0.24 code. Still need to do the upper
 layer directories but this is what everyone is waiting for....

Jeremy.
(This used to be commit 9dafb7f48ca3e7af956b0a7d1720c2546fc4cfb8)
---
 source3/client/client.c     |  2 +-
 source3/client/clitar.c     |  4 ++++
 source3/client/mount.cifs.c | 10 ++++++++++
 source3/client/smbctool.c   |  2 +-
 source3/client/smbmount.c   |  2 +-
 5 files changed, 17 insertions(+), 3 deletions(-)

(limited to 'source3/client')

diff --git a/source3/client/client.c b/source3/client/client.c
index 3c2d7afe2d..99fffa7123 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -3352,7 +3352,7 @@ static int do_message_op(void)
 
 	msg_port = port ? port : 139;
 
-	if (!(cli=cli_initialise(NULL)) || (cli_set_port(cli, msg_port) != msg_port) ||
+	if (!(cli=cli_initialise()) || (cli_set_port(cli, msg_port) != msg_port) ||
 	    !cli_connect(cli, server_name, &ip)) {
 		d_printf("Connection to %s failed\n", desthost);
 		return 1;
diff --git a/source3/client/clitar.c b/source3/client/clitar.c
index 14c28acfc5..f0d0ac595c 100644
--- a/source3/client/clitar.c
+++ b/source3/client/clitar.c
@@ -201,7 +201,11 @@ static void writetarheader(int f, const char *aname, SMB_BIG_UINT size, time_t m
 	oct_it((SMB_BIG_UINT)0, 8, hb.dbuf.uid);
 	oct_it((SMB_BIG_UINT)0, 8, hb.dbuf.gid);
 	oct_it((SMB_BIG_UINT) size, 13, hb.dbuf.size);
+#ifdef HAVE_LONGLONG
 	if (size > (SMB_BIG_UINT)077777777777LL) {    
+#else
+	if (size > (SMB_BIG_UINT)077777777777) {    
+#endif
 
 		/* This is a non-POSIX compatible extention to store files
 			greater than 8GB. */
diff --git a/source3/client/mount.cifs.c b/source3/client/mount.cifs.c
index ac98b992bb..ab1f203412 100755
--- a/source3/client/mount.cifs.c
+++ b/source3/client/mount.cifs.c
@@ -935,10 +935,20 @@ int main(int argc, char ** argv)
 		    ++nomtab;
 		    break;
 		case 'b':
+#ifdef MS_BIND
 			flags |= MS_BIND;
+#else
+			fprintf(stderr,
+				"option 'b' (MS_BIND) not supported\n");
+#endif
 			break;
 		case 'm':
+#ifdef MS_MOVE		      
 			flags |= MS_MOVE;
+#else
+			fprintf(stderr,
+				"option 'm' (MS_MOVE) not supported\n");
+#endif
 			break;
 		case 'o':
 			orgoptions = strdup(optarg);
diff --git a/source3/client/smbctool.c b/source3/client/smbctool.c
index fd385ee681..b7042f99cb 100644
--- a/source3/client/smbctool.c
+++ b/source3/client/smbctool.c
@@ -3494,7 +3494,7 @@ static int do_message_op(void)
 
 	msg_port = port ? port : 139;
 
-	if (!(cli=cli_initialise(NULL)) || (cli_set_port(cli, msg_port) != msg_port) ||
+	if (!(cli=cli_initialise()) || (cli_set_port(cli, msg_port) != msg_port) ||
 		!cli_connect(cli, server_name, &ip)) {
 		d_printf("Connection to %s failed\n", desthost);
 		return 1;
diff --git a/source3/client/smbmount.c b/source3/client/smbmount.c
index 7a3ccb7630..f1cd81198f 100644
--- a/source3/client/smbmount.c
+++ b/source3/client/smbmount.c
@@ -149,7 +149,7 @@ static struct cli_state *do_connection(char *the_service)
 	if (have_ip) ip = dest_ip;
 
 	/* have to open a new connection */
-	if (!(c=cli_initialise(NULL)) || (cli_set_port(c, smb_port) != smb_port) ||
+	if (!(c=cli_initialise()) || (cli_set_port(c, smb_port) != smb_port) ||
 	    !cli_connect(c, server_n, &ip)) {
 		DEBUG(0,("%d: Connection to %s failed\n", sys_getpid(), server_n));
 		if (c) {
-- 
cgit