summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1998-10-28 17:51:49 +0000
committerJeremy Allison <jra@samba.org>1998-10-28 17:51:49 +0000
commit94f7ce7624c22ce735c7b0f9a7079f41ac248af5 (patch)
treed2a341f9c278b85c78118125dfa4068f65218009
parent3fcd6d69cb7df37b8169df66d23cba1ea7ce067a (diff)
downloadsamba-94f7ce7624c22ce735c7b0f9a7079f41ac248af5.tar.gz
samba-94f7ce7624c22ce735c7b0f9a7079f41ac248af5.tar.bz2
samba-94f7ce7624c22ce735c7b0f9a7079f41ac248af5.zip
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. (This used to be commit 1f225abfbe6b021b589711c2e4c599a63050c5b2)
-rw-r--r--source3/include/debugparse.h8
-rw-r--r--source3/include/includes.h4
-rw-r--r--source3/include/proto.h1
-rw-r--r--source3/lib/debugparse.c10
-rw-r--r--source3/smbd/server.c1
5 files changed, 18 insertions, 6 deletions
diff --git a/source3/include/debugparse.h b/source3/include/debugparse.h
index 224141f75b..9827c43db7 100644
--- a/source3/include/debugparse.h
+++ b/source3/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/source3/include/includes.h b/source3/include/includes.h
index 9d5ee28358..1477c3ab3d 100644
--- a/source3/include/includes.h
+++ b/source3/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/source3/include/proto.h b/source3/include/proto.h
index 1af68b86d1..807ee0fbab 100644
--- a/source3/include/proto.h
+++ b/source3/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/source3/lib/debugparse.c b/source3/lib/debugparse.c
index b0f4e487ab..7b42ba9563 100644
--- a/source3/lib/debugparse.c
+++ b/source3/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/source3/smbd/server.c b/source3/smbd/server.c
index 4151bbe12a..68f722ff51 100644
--- a/source3/smbd/server.c
+++ b/source3/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");
}