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