3 files changed, 12 insertions, 8 deletions
diff --git a/source3/client/clitar.c b/source3/client/clitar.c
index c453cfbb54..43b0ef44bc 100644
--- a/source3/client/clitar.c
+++ b/source3/client/clitar.c
@@ -492,7 +492,7 @@ static int strslashcmp(char *s1, char *s2)
   if (!*s2 && (*s1 == '/' || *s1 == '\\') && !*(s1+1)) return 0;
 
   /* check for s1 is an "initial" string of s2 */
-  if ((*s2 == '/' || *s2 == '\\') && !*s1) return 0;
+  if (*s2 == '/' || *s2 == '\\') return 0;
 
   return *s1-*s2;
 }
diff --git a/source3/client/smbmount.c b/source3/client/smbmount.c
index 0db990e8bd..ad050063ec 100644
--- a/source3/client/smbmount.c
+++ b/source3/client/smbmount.c
@@ -29,6 +29,7 @@
 extern BOOL in_client;
 extern pstring user_socket_options;
 extern BOOL append_log;
+extern fstring remote_machine;
 
 static pstring credentials;
 static pstring my_netbios_name;
@@ -376,7 +377,7 @@ static void send_fs_socket(char *the_service, char *mount_point, struct cli_stat
 			}
 
 			/* here we are no longer interactive */
-			set_remote_machine_name("smbmount");	/* sneaky ... */
+			pstrcpy(remote_machine, "smbmount");	/* sneaky ... */
 			setup_logging("mount.smbfs", False);
 			append_log = True;
 			reopen_logs();
diff --git a/source3/client/smbspool.c b/source3/client/smbspool.c
index ecb5c311c5..b78d9d22a8 100644
--- a/source3/client/smbspool.c
+++ b/source3/client/smbspool.c
@@ -282,17 +282,20 @@ smb_connect(char *workgroup,		/* I - Workgroup */
   get_myname(myname);  
   	
   nt_status = cli_full_connection(&c, myname, server, NULL, 0, share, "?????", 
-				  username, workgroup, password, 0);
+				  username, lp_workgroup(), password, 0);
   
-  if (!NT_STATUS_IS_OK(nt_status)) {
+  if (NT_STATUS_IS_OK(nt_status)) {
+	  return c;
+  } else {
 	  fprintf(stderr, "ERROR:  Connection failed with error %s\n", nt_errstr(nt_status));
 	  return NULL;
   }
 
-  /*
-   * Return the new connection...
-   */
-  
+
+ /*
+  * Return the new connection...
+  */
+
   return (c);
 }