Index: trunk/src/minilzo.c
===================================================================
--- trunk/src/minilzo.c	(revision 581)
+++ trunk/src/minilzo.c	(revision 583)
@@ -82,12 +82,8 @@
 #else
 #  include <sys/types.h>
-#  if defined(STDC_HEADERS)
+#  if defined(__STDC__)
 #    include <string.h>
 #    include <stdlib.h>
-#  endif
-#  if defined(HAVE_STDDEF_H)
 #    include <stddef.h>
-#  endif
-#  if defined(HAVE_MEMORY_H)
 #    include <memory.h>
 #  endif
Index: trunk/src/samhain.c
===================================================================
--- trunk/src/samhain.c	(revision 581)
+++ trunk/src/samhain.c	(revision 583)
@@ -34,15 +34,8 @@
 #include <errno.h>
 
-
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
-#else
+#endif
 #include <time.h>
-#endif
-#endif
 
 #ifdef HAVE_MEMORY_H
Index: trunk/src/sh_entropy.c
===================================================================
--- trunk/src/sh_entropy.c	(revision 581)
+++ trunk/src/sh_entropy.c	(revision 583)
@@ -30,15 +30,8 @@
 #endif
 
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
-#else
+#endif
 #include <time.h>
-#endif
-#endif
-
 
 #include <stdlib.h>
Index: trunk/src/sh_extern.c
===================================================================
--- trunk/src/sh_extern.c	(revision 581)
+++ trunk/src/sh_extern.c	(revision 583)
@@ -74,15 +74,8 @@
 #include <sys/wait.h>
 
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
-#else
+#endif
 #include <time.h>
-#endif
-#endif
-
 
 #include "samhain.h"
Index: trunk/src/sh_getopt.c
===================================================================
--- trunk/src/sh_getopt.c	(revision 581)
+++ trunk/src/sh_getopt.c	(revision 583)
@@ -624,5 +624,5 @@
   fprintf (stdout,
 	   _("This is samhain (%s), "\
-	     "(c) 1999-2008 Rainer Wichmann (http://la-samhna.de).\n"),
+	     "(c) 1999-2024 Rainer Wichmann (http://la-samhna.de).\n"),
 	   VERSION);
   fprintf (stdout, "%s",_("This software comes with ABSOLUTELY NO WARRANTY. "));
@@ -714,5 +714,5 @@
   fprintf (stdout,
 	   _("This is samhain (%s), "\
-	     "(c) 1999-2006 Rainer Wichmann (http://la-samhna.de).\n"),
+	     "(c) 1999-2024 Rainer Wichmann (http://la-samhna.de).\n"),
 	   VERSION);
   fprintf (stdout, "%s",_("This software comes with ABSOLUTELY NO WARRANTY. "));
Index: trunk/src/sh_hash.c
===================================================================
--- trunk/src/sh_hash.c	(revision 581)
+++ trunk/src/sh_hash.c	(revision 583)
@@ -2882,14 +2882,8 @@
 } 
 
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
-#else
+#endif
 #include <time.h>
-#endif
-#endif
 
 static int ListFullDetail    = S_FALSE;
Index: trunk/src/sh_html.c
===================================================================
--- trunk/src/sh_html.c	(revision 581)
+++ trunk/src/sh_html.c	(revision 583)
@@ -24,14 +24,9 @@
 #include <stdlib.h>
 
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
-#else
+#endif
 #include <time.h>
-#endif
-#endif
+
 #include <unistd.h>
 
Index: trunk/src/sh_login_track.c
===================================================================
--- trunk/src/sh_login_track.c	(revision 581)
+++ trunk/src/sh_login_track.c	(revision 583)
@@ -58,15 +58,8 @@
 
 
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
-#else
+#endif
 #include <time.h>
-#endif
-#endif
-
 
 #define SH_LTRACK_VERSION 1
Index: trunk/src/sh_mail.c
===================================================================
--- trunk/src/sh_mail.c	(revision 581)
+++ trunk/src/sh_mail.c	(revision 583)
@@ -34,15 +34,8 @@
 #if defined(SH_WITH_MAIL)
 
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
-#else
+#endif
 #include <time.h>
-#endif
-#endif
-
 
 #ifdef HAVE_MEMORY_H
Index: trunk/src/sh_prelude.c
===================================================================
--- trunk/src/sh_prelude.c	(revision 581)
+++ trunk/src/sh_prelude.c	(revision 583)
@@ -41,18 +41,8 @@
 #include <sys/types.h>
 
-#if TIME_WITH_SYS_TIME
-
-# include <sys/time.h>
-# include <time.h>
-
-#else
-
-# if HAVE_SYS_TIME_H
-#  include <sys/time.h>
-# else
-#  include <time.h>
-# endif
-
-#endif
+#if HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
+#include <time.h>
 
 #include <unistd.h>
Index: trunk/src/sh_schedule.c
===================================================================
--- trunk/src/sh_schedule.c	(revision 581)
+++ trunk/src/sh_schedule.c	(revision 583)
@@ -42,14 +42,8 @@
 #endif
 
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
-#else
+#endif
 #include <time.h>
-#endif
-#endif
 
 #include "samhain.h"
Index: trunk/src/sh_socket.c
===================================================================
--- trunk/src/sh_socket.c	(revision 581)
+++ trunk/src/sh_socket.c	(revision 583)
@@ -33,14 +33,8 @@
 #include <string.h>
 
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
-#else
+#endif
 #include <time.h>
-#endif
-#endif
 
 #include "samhain.h"
Index: trunk/src/sh_srp.c
===================================================================
--- trunk/src/sh_srp.c	(revision 581)
+++ trunk/src/sh_srp.c	(revision 583)
@@ -28,4 +28,17 @@
 
 #ifdef USE_SRP_PROTOCOL
+
+/* dont modify this, unless you know what you do
+ */
+#define SRP_GENERATOR_1024      "2"
+#define SRP_MODULUS_1024_1        \
+_("f488fd584e49dbcd20b49de49107366b336c380d451d0f7c88b31c7c5b2d8ef6") 
+#define SRP_MODULUS_1024_2        \
+_("f3c923c043f0a55b188d8ebb558cb85d38d334fd7c175743a31d186cde33212c") 
+#define SRP_MODULUS_1024_3        \
+_("b52aff3ce1b1294018118d7c84a70a72d686c40319c807297aca950cd9969fab")
+#define SRP_MODULUS_1024_4        \
+_("d00a509b0246d3083d66a45d419f9c7cbd894b221926baaba25ec355e92f78c7")
+
 
 #if (defined (SH_WITH_CLIENT) || defined (SH_WITH_SERVER))
Index: trunk/src/sh_suidchk.c
===================================================================
--- trunk/src/sh_suidchk.c	(revision 581)
+++ trunk/src/sh_suidchk.c	(revision 583)
@@ -42,14 +42,8 @@
 #if defined (SH_WITH_CLIENT) || defined (SH_STANDALONE) 
 
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
-#else
+#endif
 #include <time.h>
-#endif
-#endif
 
 #ifdef HAVE_DIRENT_H
Index: trunk/src/sh_unix.c
===================================================================
--- trunk/src/sh_unix.c	(revision 581)
+++ trunk/src/sh_unix.c	(revision 583)
@@ -58,14 +58,8 @@
 #endif
 
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
-#else
+#endif
 #include <time.h>
-#endif
-#endif
 
 #ifdef HAVE_SYS_SELECT_H
Index: trunk/src/sh_utils.c
===================================================================
--- trunk/src/sh_utils.c	(revision 581)
+++ trunk/src/sh_utils.c	(revision 583)
@@ -27,15 +27,8 @@
 #include <unistd.h>
 
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
-#else
+#endif
 #include <time.h>
-#endif
-#endif
-
 
 #include "samhain.h"
Index: trunk/src/sh_xfer_client.c
===================================================================
--- trunk/src/sh_xfer_client.c	(revision 581)
+++ trunk/src/sh_xfer_client.c	(revision 583)
@@ -59,14 +59,8 @@
 #endif
 
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
-#else
+#endif
 #include <time.h>
-#endif
-#endif
 
 #ifdef HAVE_SYS_SELECT_H
Index: trunk/src/sh_xfer_server.c
===================================================================
--- trunk/src/sh_xfer_server.c	(revision 581)
+++ trunk/src/sh_xfer_server.c	(revision 583)
@@ -59,22 +59,8 @@
 #endif
 
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
-#else
+#endif
 #include <time.h>
-#endif
-#endif
-
-/*
-#ifdef TM_IN_SYS_TIME
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-*/
 
 #ifdef HAVE_SYS_SELECT_H
Index: trunk/src/sh_xfer_syslog.c
===================================================================
--- trunk/src/sh_xfer_syslog.c	(revision 581)
+++ trunk/src/sh_xfer_syslog.c	(revision 583)
@@ -32,14 +32,8 @@
 #include <netinet/in.h>
 
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
-#else
+#endif
 #include <time.h>
-#endif
-#endif
 
 #include <unistd.h>
Index: trunk/src/slib.c
===================================================================
--- trunk/src/slib.c	(revision 581)
+++ trunk/src/slib.c	(revision 583)
@@ -35,14 +35,8 @@
 #endif
 
-#if TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
 #if HAVE_SYS_TIME_H
 #include <sys/time.h>
-#else
+#endif
 #include <time.h>
-#endif
-#endif
 
 #ifdef HAVE_MEMORY_H