summaryrefslogtreecommitdiff
path: root/source3/client
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>1996-10-05 02:54:37 +0000
committerAndrew Tridgell <tridge@samba.org>1996-10-05 02:54:37 +0000
commit38087ccb4071bfff29801026e2bf5c47565305b4 (patch)
tree41e9bfd4677d25ec700217a58df888cefae8c871 /source3/client
parent32e9d441afe29dde38c2ad8f089f396bdc6199ee (diff)
downloadsamba-38087ccb4071bfff29801026e2bf5c47565305b4.tar.gz
samba-38087ccb4071bfff29801026e2bf5c47565305b4.tar.bz2
samba-38087ccb4071bfff29801026e2bf5c47565305b4.zip
- use workgroup from smb.conf in smbclient
- change debug level on clitar stuff - define MAP_FILE if not defined - ensure we never set authoritative on queries in nmbd - fake a positive response to SMBioctl, apparently this is needed for some WfWg printer drivers - deny file access for non-fcbopen queries when (access_allowed == AREAD && flags == O_RDWR) - add sys_waitpid() (This used to be commit 61e3116e573637d6b5a878eeb8db72831e3c5bd1)
Diffstat (limited to 'source3/client')
-rw-r--r--source3/client/client.c5
-rw-r--r--source3/client/clitar.c8
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);
}