Index: trunk/docs/Changelog
===================================================================
--- trunk/docs/Changelog	(revision 341)
+++ trunk/docs/Changelog	(revision 342)
@@ -1,4 +1,7 @@
 2.8.4a:
-	* Fix for compile error with --enable-udp (reported by Sean Chittenden)
+	* Fix for compile error with --with-prelude 
+	  (reported by Sean Chittenden), missing regression test added
+	* Fix for compile error with --enable-udp (reported by Sean Chittenden),
+	  missing regression test added
 
 2.8.4:
Index: trunk/src/sh_forward.c
===================================================================
--- trunk/src/sh_forward.c	(revision 341)
+++ trunk/src/sh_forward.c	(revision 342)
@@ -3615,5 +3615,5 @@
 		  {
 		    char peer_ip[SH_IP_BUF];
-		    sh_ipvx_ntoa(peer_ip, sizeof(peer_ip), conn->addr_peer); 
+		    sh_ipvx_ntoa(peer_ip, sizeof(peer_ip), &(conn->addr_peer)); 
 		    sh_error_set_peer_ip( peer_ip );
 		  }                        
Index: trunk/src/sh_prelude.c
===================================================================
--- trunk/src/sh_prelude.c	(revision 341)
+++ trunk/src/sh_prelude.c	(revision 342)
@@ -1141,5 +1141,5 @@
 }
 
-
+#if defined(SH_WITH_SERVER)
 static int node_set_address(idmef_node_t *node, const char *addr)
 {
@@ -1168,9 +1168,10 @@
         return -1;
 }
-
+#endif
                                           
 
 static int samhain_alert_prelude(int priority, int sh_class, 
-				 char *message, unsigned long msgid, char * inet_peer_ip)
+				 char *message, unsigned long msgid, 
+				 char * inet_peer_ip)
 {
         int ret;
@@ -1187,4 +1188,6 @@
 #if defined(SH_WITH_SERVER)
         idmef_node_t *node;
+#else
+	(void) inet_peer_ip;
 #endif
                 
Index: trunk/test/testcompile.sh
===================================================================
--- trunk/test/testcompile.sh	(revision 341)
+++ trunk/test/testcompile.sh	(revision 342)
@@ -21,5 +21,5 @@
 
 # dnmalloc + flawfinder + (36 * 3)
-MAXTEST=110; export MAXTEST
+MAXTEST=116; export MAXTEST
 
 run_dnmalloc ()
@@ -685,4 +685,52 @@
 
 	#
+	# test client/server compilation w/prelude
+	#
+	TEST="${S}client/server application w/prelude${E}"
+	#
+	if [ -z "$doall" ]; then
+	    let "num = num + 1" >/dev/null
+	    [ -z "$quiet" ] && log_skip $2 ${MAXTEST} "$TEST";
+	    let "num = num + 1" >/dev/null
+	    [ -z "$quiet" ] && log_skip $2 ${MAXTEST} "$TEST (smatch)";
+	    let "num = num + 1" >/dev/null
+	    [ -z "$quiet" ] && log_skip $2 ${MAXTEST} "$TEST (uno)";
+
+	    let "num = num + 1" >/dev/null
+	    [ -z "$quiet" ] && log_skip $2 ${MAXTEST} "$TEST";
+	    let "num = num + 1" >/dev/null
+	    [ -z "$quiet" ] && log_skip $2 ${MAXTEST} "$TEST (smatch)";
+	    let "num = num + 1" >/dev/null
+	    [ -z "$quiet" ] && log_skip $2 ${MAXTEST} "$TEST (uno)";
+	else
+	    if test -r "Makefile"; then
+		$MAKE clean
+	    fi
+	    #
+	    ${TOP_SRCDIR}/configure --quiet --enable-network=client  --enable-srp --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$PW_DIR/samhainrc.test   --with-prelude > /dev/null 2>> test_log   
+	    #
+	    let "num = num + 1" >/dev/null
+	    testmake $? $num || let "numfail = numfail + 1" >/dev/null
+	    let "num = num + 1" >/dev/null
+	    run_smatch $? $num || let "numfail = numfail + 1"  >/dev/null
+	    let "num = num + 1" >/dev/null
+	    run_uno $? $num || let "numfail = numfail + 1"  >/dev/null
+	    
+	    if test -r "Makefile"; then
+		$MAKE clean
+	    fi
+	    #
+	    ${TOP_SRCDIR}/configure --quiet --enable-network=server  --enable-srp --prefix=$PW_DIR --localstatedir=$PW_DIR --with-config-file=$PW_DIR/samhainrc.test   --with-prelude > /dev/null 2>> test_log   
+	    #
+	    let "num = num + 1" >/dev/null
+	    testmake $? $num || let "numfail = numfail + 1" >/dev/null
+	    let "num = num + 1" >/dev/null
+	    run_smatch $? $num || let "numfail = numfail + 1"  >/dev/null
+	    let "num = num + 1" >/dev/null
+	    run_uno $? $num || let "numfail = numfail + 1"  >/dev/null
+	    #
+	fi
+
+	#
 	# test client/server compilation
 	#