summaryrefslogtreecommitdiff
path: root/source3/utils
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>1996-10-02 14:09:22 +0000
committerAndrew Tridgell <tridge@samba.org>1996-10-02 14:09:22 +0000
commit5a2f52b79e28530c454cb488a44588147640f061 (patch)
tree1f412098bbcf050bce556d00f2c3fddd470746c9 /source3/utils
parent11d9539d755d5c5accb4481577781b8b7bfeda50 (diff)
downloadsamba-5a2f52b79e28530c454cb488a44588147640f061.tar.gz
samba-5a2f52b79e28530c454cb488a44588147640f061.tar.bz2
samba-5a2f52b79e28530c454cb488a44588147640f061.zip
- a huge pile of changes from Luke which implement the browse.conf
stuff and also fix a pile of nmbd bugs. Unfortunately I found it very hard to disentangle the new features from the bug fixes so I am putting in the new code. I hope this is the last big pile of changes to the 1.9.16 series! (This used to be commit 20b6203dac4bbb43e4e7bea0b214496d76d679d9)
Diffstat (limited to 'source3/utils')
-rw-r--r--source3/utils/nmblookup.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/source3/utils/nmblookup.c b/source3/utils/nmblookup.c
index d418814a69..c137b4f93a 100644
--- a/source3/utils/nmblookup.c
+++ b/source3/utils/nmblookup.c
@@ -100,6 +100,7 @@ int main(int argc,char *argv[])
BOOL find_master=False;
BOOL find_status=False;
int i;
+ static pstring servicesf = CONFIGFILE;
DEBUGLEVEL = 1;
*lookup = 0;
@@ -110,7 +111,7 @@ int main(int argc,char *argv[])
charset_initialise();
- while ((opt = getopt(argc, argv, "p:d:B:i:SMh")) != EOF)
+ while ((opt = getopt(argc, argv, "p:d:B:i:s:SMh")) != EOF)
switch (opt)
{
case 'B':
@@ -129,6 +130,9 @@ int main(int argc,char *argv[])
case 'd':
DEBUGLEVEL = atoi(optarg);
break;
+ case 's':
+ strcpy(servicesf, optarg);
+ break;
case 'h':
usage();
exit(0);
@@ -143,6 +147,11 @@ int main(int argc,char *argv[])
exit(1);
}
+ if (!lp_load(servicesf,True)) {
+ fprintf(stderr, "Can't load %s - run testparm to debug it\n", servicesf);
+ return (-1);
+ }
+
load_interfaces();
init_structs();
if (!open_sockets()) return(1);