diff options
| author | Andrew Tridgell <tridge@samba.org> | 2005-06-26 01:11:12 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:18:49 -0500 |
| commit | 2a90c448bd0c4f05038f0936aa0b3390b275c6dc (patch) | |
| tree | 33a325d8b93c3c0137a32af15ef678a72dd62bc9 /source4/client | |
| parent | 244882311bc93f0bee325901b082420a96f3f798 (diff) | |
| download | samba-2a90c448bd0c4f05038f0936aa0b3390b275c6dc.tar.gz samba-2a90c448bd0c4f05038f0936aa0b3390b275c6dc.tar.bz2 samba-2a90c448bd0c4f05038f0936aa0b3390b275c6dc.zip | |
r7916: - got rid of the in_client global
- make not finding smb.conf a level 1 message, not level 0. Most of our
tools handle no smb.conf, and those that don't should check for the
specific parameters they need, or use the defaults
(This used to be commit 8c17b61f8e0f6eefa6a1f853abc06d023627bbbb)
Diffstat (limited to 'source4/client')
| -rw-r--r-- | source4/client/client.c | 3 | ||||
| -rw-r--r-- | source4/client/smbmount.c | 4 | ||||
| -rw-r--r-- | source4/client/smbspool.c | 9 |
3 files changed, 0 insertions, 16 deletions
diff --git a/source4/client/client.c b/source4/client/client.c index 5e5d7e5dcd..c1f5ab9b34 100644 --- a/source4/client/client.c +++ b/source4/client/client.c @@ -39,7 +39,6 @@ #endif static struct smbcli_state *cli; -extern BOOL in_client; static int port = 0; static pstring cur_dir = "\\"; static pstring cd_path = ""; @@ -3370,8 +3369,6 @@ static void remember_query_host(const char *arg, pc = poptGetContext("smbclient", argc, (const char **) argv, long_options, 0); poptSetOtherOptionHelp(pc, "[OPTIONS] service <password>"); - in_client = True; /* Make sure that we tell lp_load we are */ - while ((opt = poptGetNextOpt(pc)) != -1) { switch (opt) { case 'M': diff --git a/source4/client/smbmount.c b/source4/client/smbmount.c index 5c541a7e4f..77cd04c3c3 100644 --- a/source4/client/smbmount.c +++ b/source4/client/smbmount.c @@ -25,8 +25,6 @@ #include <asm/types.h> #include <linux/smb_fs.h> -extern BOOL in_client; - static pstring credentials; static pstring my_netbios_name; static pstring password; @@ -870,8 +868,6 @@ static void parse_mount_smb(int argc, char **argv) setenv("CLI_FORCE_ASCII", "true", 1); #endif - in_client = True; /* Make sure that we tell lp_load we are */ - if (getenv("USER")) { pstrcpy(username,getenv("USER")); diff --git a/source4/client/smbspool.c b/source4/client/smbspool.c index c975e04771..2703205d7d 100644 --- a/source4/client/smbspool.c +++ b/source4/client/smbspool.c @@ -23,13 +23,6 @@ #include "includes.h" /* - * Globals... - */ - -extern BOOL in_client; /* Boolean for client library */ - - -/* * Local functions... */ @@ -184,8 +177,6 @@ static int smb_print(struct smbcli_state *, char *, FILE *); setup_logging("smbspool", DEBUG_STDOUT); - in_client = True; /* Make sure that we tell lp_load we are */ - if (!lp_load(dyn_CONFIGFILE)) { fprintf(stderr, "ERROR: Can't load %s - run testparm to debug it\n", dyn_CONFIGFILE); |