summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Sharpe <sharpe@samba.org>1998-09-29 04:43:40 +0000
committerRichard Sharpe <sharpe@samba.org>1998-09-29 04:43:40 +0000
commite1d962659f45c6a9bc1a2385ab4f8f4ca0af081c (patch)
tree68f6c6d0b81905ed3242fcf9ad5282eff984982c
parent4746a0b93f9c6fdc223a1e80c1024c030c05c10c (diff)
downloadsamba-e1d962659f45c6a9bc1a2385ab4f8f4ca0af081c.tar.gz
samba-e1d962659f45c6a9bc1a2385ab4f8f4ca0af081c.tar.bz2
samba-e1d962659f45c6a9bc1a2385ab4f8f4ca0af081c.zip
Now have a better solution to the need to have smblcient find
a WINS server if running on the WINS server. As suggested by Andrew, we have a flag, in_client=False by default, and set it to True in the client. loadparam.c checks this and sets szWINSserver to 127.0.0.1 when in_client && bWINSsupport. BTW, we seem to have picked up and unused value in some of Luke's new code. (This used to be commit b665756bfc813b229ad50b0d5f53e8b779537a3f)
-rw-r--r--source3/client/client.c3
-rw-r--r--source3/param/loadparm.c10
2 files changed, 13 insertions, 0 deletions
diff --git a/source3/client/client.c b/source3/client/client.c
index e34131d6d0..0d27039cb9 100644
--- a/source3/client/client.c
+++ b/source3/client/client.c
@@ -29,6 +29,7 @@
pstring cur_dir = "\\";
pstring cd_path = "";
+extern BOOL in_client;
extern pstring service;
extern pstring desthost;
extern pstring global_myname;
@@ -3789,6 +3790,8 @@ static void usage(char *pname)
DEBUG(0,("Failed to get my hostname.\n"));
}
+ in_client = True;
+
if (!lp_load(servicesf,True,False,False)) {
fprintf(stderr, "Can't load %s - run testparm to debug it\n", servicesf);
}
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 2fd2212a4c..05ed6484ac 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -65,6 +65,7 @@
#define KANJI "sbcs"
#endif /* KANJI */
+BOOL in_client = False; /* Not in the client by default */
BOOL bLoaded = False;
extern int DEBUGLEVEL;
@@ -2480,6 +2481,15 @@ BOOL lp_load(char *pszFname,BOOL global_only, BOOL save_defaults, BOOL add_ipc)
set_default_server_announce_type();
+ /* We set a WINS server address of 127.0.0.1 if we are in the client */
+ /* and we have WINS support enabled */
+
+ if (in_client && Globals.bWINSsupport) {
+
+ string_set(&Globals.szWINSserver, "127.0.0.1");
+
+ }
+
bLoaded = True;
return (bRetval);