diff options
Diffstat (limited to 'source3/client')
| -rw-r--r-- | source3/client/client.c | 5 | ||||
| -rw-r--r-- | source3/client/clitar.c | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/source3/client/client.c b/source3/client/client.c index 596d6a9677..b8b63207d7 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -36,7 +36,7 @@ pstring desthost=""; extern pstring myname; pstring password = ""; pstring username=""; -pstring workgroup=WORKGROUP; +pstring workgroup=""; char *cmdstr=""; BOOL got_pass = False; BOOL connect_as_printer = False; @@ -4503,6 +4503,9 @@ static void usage(char *pname) return (-1); } + if (*workgroup == 0) + strcpy(workgroup,lp_workgroup()); + load_interfaces(); get_myname(*myname?NULL:myname,NULL); strupper(myname); diff --git a/source3/client/clitar.c b/source3/client/clitar.c index 13df5fef9a..191e0e4dab 100644 --- a/source3/client/clitar.c +++ b/source3/client/clitar.c @@ -823,7 +823,7 @@ static void do_atar(char *rname,char *lname,file_info *finfo1) datalen = 0; } - DEBUG(2,("getting file %s of size %d bytes as a tar file %s", + DEBUG(1,("getting file %s of size %d bytes as a tar file %s", finfo.name, finfo.size, lname)); @@ -1079,7 +1079,7 @@ static void do_atar(char *rname,char *lname,file_info *finfo1) get_total_size += finfo.size; /* Thanks to Carel-Jan Engel (ease@mail.wirehub.nl) for this one */ - DEBUG(2,("(%g kb/s) (average %g kb/s)\n", + DEBUG(1,("(%g kb/s) (average %g kb/s)\n", finfo.size / MAX(0.001, (1.024*this_time)), get_total_size / MAX(0.001, (1.024*get_total_time_ms)))); } @@ -1406,7 +1406,7 @@ void cmd_block(void) } blocksize=block; - DEBUG(2,("blocksize is now %d\n", blocksize)); + DEBUG(1,("blocksize is now %d\n", blocksize)); } /**************************************************************************** @@ -1483,7 +1483,7 @@ void cmd_setmode(void) return; } - DEBUG(2, ("\nperm set %d %d\n", attra[ATTRSET], attra[ATTRRESET])); + DEBUG(1, ("\nperm set %d %d\n", attra[ATTRSET], attra[ATTRRESET])); (void) do_setrattr(fname, attra[ATTRSET], ATTRSET); (void) do_setrattr(fname, attra[ATTRRESET], ATTRRESET); } |