a huge pile of changes :-)

The biggest thing is the integration of Lukes new nmbd. Its still
largely untested, so we will really need some feedback

I've also added auto prototype generation and cleaned up a lot of
minor things as a result
(This used to be commit 0d8dcfa13c527ec2c8aca39ba49c09e4e694b26c)

4 files changed, 7 insertions, 6 deletions

diff --git a/source3/utils/nmblookup.c b/source3/utils/nmblookup.c
index aa43173332..6289ef74b1 100644
--- a/source3/utils/nmblookup.c
+++ b/source3/utils/nmblookup.c
@@ -25,7 +25,6 @@
 #endif
 
 #include "includes.h"
-#include "nameserv.h"
 
 extern int DEBUGLEVEL;
 
@@ -35,6 +34,7 @@ extern struct in_addr bcast_ip;
 extern pstring myhostname;
 
 static BOOL got_bcast = False;
+struct in_addr ipzero;
 
 int ServerFD= -1;
 
@@ -124,6 +124,8 @@ int main(int argc,char *argv[])
 
   TimeInit();
 
+  ipzero = *interpret_addr2("0.0.0.0");
+
   setup_logging(argv[0],True);
 
   charset_initialise();
diff --git a/source3/utils/smbpasswd.c b/source3/utils/smbpasswd.c
index 1569a3cd88..c79aa15c80 100644
--- a/source3/utils/smbpasswd.c
+++ b/source3/utils/smbpasswd.c
@@ -201,14 +201,13 @@ _my_get_smbpwnam(FILE * fp, char *name, BOOL * valid_old_pwd,
 /*
  * Print command usage on stderr and die.
  */
-void 
-usage(char *name)
+static void usage(char *name)
 {
 	fprintf(stderr, "Usage is : %s [username]\n", name);
 	exit(1);
 }
 
-int main(int argc, char **argv)
+ int main(int argc, char **argv)
 {
   int             real_uid;
   struct passwd  *pwd;
diff --git a/source3/utils/status.c b/source3/utils/status.c
index 2a2a5ca4c1..65e9d975f1 100644
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -44,7 +44,7 @@ unsigned int   Ucrit_checkUsername(pstring username); /* added by OH */
 void           Ucrit_addPid(int pid);                 /* added by OH */
 unsigned int   Ucrit_checkPid(int pid);               /* added by OH */
 
-int main(int argc, char *argv[])
+ int main(int argc, char *argv[])
 {
   FILE *f;
   pstring fname;
diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index 1eaaa10b3b..c6fa674b2d 100644
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -41,7 +41,7 @@
 extern FILE *dbf;
 extern int DEBUGLEVEL;
 
-int main(int argc, char *argv[])
+ int main(int argc, char *argv[])
 {
   pstring configfile;
   int s;