Quick fixes to fix the broken tree. Needed for my morning compiles.

Chris - feel free to fix these things differently if these fixes don't
work for you.
Jeremy.

diff --git a/source/include/debugparse.h b/source/include/debugparse.h
index 224141f75b832464bb0d6d2cfbc77de5e7b5f75e..9827c43db74e85390891b0b6f372db59c23a2664 100644 (file)
--- a/source/include/debugparse.h
+++ b/source/include/debugparse.h
@@ -35,6 +35,12 @@
  * -------------------------------------------------------------------------- **
  *
  * $Log: debugparse.h,v $
+ * Revision 1.2  1998/10/28 17:51:48  jra
+ * Quick fixes to fix the broken tree. Needed for my morning compiles.
+ * Chris - feel free to fix these things differently if these fixes don't
+ * work for you.
+ * Jeremy.
+ *
  * Revision 1.1  1998/10/26 23:21:37  crh
  * Here is the simple debug parser and the debug2html converter.  Still to do:
  *
@@ -50,8 +56,6 @@
  * ========================================================================== **
  */
 
-#include "includes.h"
-
 /* -------------------------------------------------------------------------- **
  * These are the tokens returned by dbg_char2token().
  */

diff --git a/source/include/includes.h b/source/include/includes.h
index 9d5ee28358b9b8c08ab6e2a6976599c2270483f9..1477c3ab3d5bbcbb4fd2602c43cf609ac2c5c7e3 100644 (file)
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -494,6 +494,8 @@ extern int errno;
 
 #include "nterr.h"
 
+#include "debugparse.h"
+
 #ifndef MAXCODEPAGELINES
 #define MAXCODEPAGELINES 256
 #endif
@@ -680,7 +682,7 @@ int setresuid(uid_t ruid, uid_t euid, uid_t suid);
 int setresgid(gid_t rgid, gid_t egid, gid_t sgid);
 #endif
 
-#if (defined(HAVE_CRYPT) && !defined(HAVE_CRYPT_DECL))
+#if (defined(HAVE_CRYPT) && !defined(HAVE_CRYPT_DECL) && !defined(KRB4_AUTH))
 /* stupid glibc */
 int crypt(const char *key, const char *salt);
 #endif

diff --git a/source/include/proto.h b/source/include/proto.h
index 1af68b86d1433f99e4bcfe643313abe37f1d97e7..807ee0fbab206a9f9ff3097551e7a3546d251419 100644 (file)
--- a/source/include/proto.h
+++ b/source/include/proto.h
@@ -88,7 +88,6 @@ BOOL dbghdr( int level, char *file, char *func, int line );
 
 char *dbg_token2string( dbg_Token tok );
 void dbg_test( void );
-int main( void );
 
 /*The following definitions come from  lib/fault.c  */
 

diff --git a/source/lib/debugparse.c b/source/lib/debugparse.c
index b0f4e487ab64edf35c5c1a2f057a8090ac2e77aa..7b42ba9563b4dd69f074c2e1dd3c69478a57a088 100644 (file)
--- a/source/lib/debugparse.c
+++ b/source/lib/debugparse.c
@@ -29,6 +29,12 @@
  * -------------------------------------------------------------------------- **
  *
  * $Log: debugparse.c,v $
+ * Revision 1.2  1998/10/28 17:51:49  jra
+ * Quick fixes to fix the broken tree. Needed for my morning compiles.
+ * Chris - feel free to fix these things differently if these fixes don't
+ * work for you.
+ * Jeremy.
+ *
  * Revision 1.1  1998/10/26 23:21:37  crh
  * Here is the simple debug parser and the debug2html converter.  Still to do:
  *
@@ -44,7 +50,7 @@
  * ========================================================================== **
  */
 
-#include "debugparse.h"
+#include "includes.h"
 
 /* -------------------------------------------------------------------------- **
  * Constants...
@@ -312,7 +318,7 @@ void dbg_test( void )
  * This simple main line can be uncommented and used to test the parser.
  */
 /*
-int main( void )
+ int main( int argc, char **argv)
   {
   dbg_test();
   return( 0 );

diff --git a/source/smbd/server.c b/source/smbd/server.c
index 4151bbe12a71cc00853f90ee58e14035b8f7d87b..68f722ff51b0795dc37629dad5fe3b8f302b362f 100644 (file)
--- a/source/smbd/server.c
+++ b/source/smbd/server.c
@@ -486,6 +486,7 @@ static void usage(char *pname)
        printf("\t-P                    passive only\n");
        printf("\t-a                    append to log file (default)\n");
        printf("\t-o                    overwrite log file, don't append\n");
+       printf("\t-i scope              NetBIOS scope to use (default none)\n");
        printf("\n");
 }