You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
 
 

63 lines
1.8 KiB

--- include/util.h Wed May 29 10:04:26 2002
+++ include/util.h Mon Oct 21 16:31:03 2002
@@ -57,6 +57,8 @@
void init_sighandler(void);
+#ifndef HAVE_STRNSTR
char* strnstr(char* haystack,char* needle,int n);
+#endif
#endif
--- src/Makefile.am Wed Mar 6 14:12:12 2002
+++ src/Makefile.am Fri Nov 15 09:12:05 2002
@@ -46,7 +46,7 @@
util.c \
aide.c
-INCLUDES = -I$(prefix)/include -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include -I$(prefix)/include
LDADD = @CRYPTLIB@ @ACLLIB@
--- src/Makefile.in Tue Jun 4 10:33:26 2002
+++ src/Makefile.in Fri Nov 15 09:01:44 2002
@@ -98,7 +98,7 @@
aide_SOURCES = conf_yacc.y conf_lex.l getopt.c getopt1.c gnu_regex.c error.c md.c db.c commandconf.c db_file.c db_disk.c db_lex.l db_sql.c gen_list.c list.c do_md.c base64.c symboltable.c compare_db.c be.c util.c aide.c
-INCLUDES = -I$(prefix)/include -I$(top_srcdir)/include
+INCLUDES = -I$(top_srcdir)/include -I$(prefix)/include
LDADD = @CRYPTLIB@ @ACLLIB@
--- src/util.c Wed May 29 10:04:27 2002
+++ src/util.c Mon Oct 21 16:31:15 2002
@@ -356,7 +356,7 @@
return;
}
-
+#ifndef HAVE_STRNSTR
/* Like strstr but only do search for maximum of n chars.
haystack does not have to be NULL terminated
needle has to be NULL terminated. NULL in needle is not used in compare.
@@ -392,6 +392,7 @@
/* If we get this far no match was found so we return NULL */
return NULL;
}
+#endif
/* We need these dummy stubs to fool the linker into believing that
we do not need them at link time */
Index: src/do_md.c
--- src/do_md.c.orig 2004-02-10 18:40:27.000000000 +0100
+++ src/do_md.c 2004-02-10 18:41:14.000000000 +0100
@@ -43,7 +43,6 @@
/* This define should be somewhere else */
#define READ_BLOCK_SIZE 16384
-#define READ_BLOCK_SIZE 16777216
#ifdef WITH_MHASH
#include <mhash.h>