svn commit: samba r24601 - in branches: SAMBA_3_2/source/client SAMBA_3_2/source/python SAMBA_3_2_0/source/client SAMBA_3_2_0/source/python

lmuelle at samba.org lmuelle at samba.org
Tue Aug 21 14:42:36 GMT 2007


Author: lmuelle
Date: 2007-08-21 14:42:36 +0000 (Tue, 21 Aug 2007)
New Revision: 24601

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24601

Log:
Fix if statements where we still expected cli_connect() to return BOOL.

Modified:
   branches/SAMBA_3_2/source/client/smbctool.c
   branches/SAMBA_3_2/source/python/py_smb.c
   branches/SAMBA_3_2_0/source/client/smbctool.c
   branches/SAMBA_3_2_0/source/python/py_smb.c


Changeset:
Modified: branches/SAMBA_3_2/source/client/smbctool.c
===================================================================
--- branches/SAMBA_3_2/source/client/smbctool.c	2007-08-21 14:42:13 UTC (rev 24600)
+++ branches/SAMBA_3_2/source/client/smbctool.c	2007-08-21 14:42:36 UTC (rev 24601)
@@ -3494,7 +3494,7 @@
 	msg_port = port ? port : 139;
 
 	if (!(cli=cli_initialise()) || (cli_set_port(cli, msg_port) != msg_port) ||
-		!cli_connect(cli, server_name, &ip)) {
+		!NT_STATUS_IS_OK(cli_connect(cli, server_name, &ip))) {
 		d_printf("Connection to %s failed\n", desthost);
 		return 1;
 	}

Modified: branches/SAMBA_3_2/source/python/py_smb.c
===================================================================
--- branches/SAMBA_3_2/source/python/py_smb.c	2007-08-21 14:42:13 UTC (rev 24600)
+++ branches/SAMBA_3_2/source/python/py_smb.c	2007-08-21 14:42:36 UTC (rev 24601)
@@ -47,7 +47,7 @@
 
 	ZERO_STRUCT(ip);
 
-	if (!cli_connect(cli, server, &ip))
+	if (!NT_STATUS_IS_OK(cli_connect(cli, server, &ip)))
 		return NULL;
 
 	return new_cli_state_object(cli);

Modified: branches/SAMBA_3_2_0/source/client/smbctool.c
===================================================================
--- branches/SAMBA_3_2_0/source/client/smbctool.c	2007-08-21 14:42:13 UTC (rev 24600)
+++ branches/SAMBA_3_2_0/source/client/smbctool.c	2007-08-21 14:42:36 UTC (rev 24601)
@@ -3494,7 +3494,7 @@
 	msg_port = port ? port : 139;
 
 	if (!(cli=cli_initialise()) || (cli_set_port(cli, msg_port) != msg_port) ||
-		!cli_connect(cli, server_name, &ip)) {
+		!NT_STATUS_IS_OK(cli_connect(cli, server_name, &ip))) {
 		d_printf("Connection to %s failed\n", desthost);
 		return 1;
 	}

Modified: branches/SAMBA_3_2_0/source/python/py_smb.c
===================================================================
--- branches/SAMBA_3_2_0/source/python/py_smb.c	2007-08-21 14:42:13 UTC (rev 24600)
+++ branches/SAMBA_3_2_0/source/python/py_smb.c	2007-08-21 14:42:36 UTC (rev 24601)
@@ -47,7 +47,7 @@
 
 	ZERO_STRUCT(ip);
 
-	if (!cli_connect(cli, server, &ip))
+	if (!NT_STATUS_IS_OK(cli_connect(cli, server, &ip)))
 		return NULL;
 
 	return new_cli_state_object(cli);



More information about the samba-cvs mailing list