- 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)

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);