Changeset 290 for trunk/src/sh_prelude.c

Timestamp:

Aug 15, 2010, 12:27:47 PM (14 years ago)

Author:

katerina

Message:

Fixes for tickets #215, #216, #217, #218, version bumped to 2.7.2

File:

• trunk/src/sh_prelude.c (modified) (3 diffs)

trunk/src/sh_prelude.c

@@ -705 +705 @@
 #if defined(SH_WITH_SERVER)
         /* when using yule, theres a msg=<... msg=<...> >*/
-        do {
-                msg = ptr;
-                ptr = get_value(msg, _("msg"), NULL);
-                if ( ! ptr ) {
-                        ptr = msg;
-                        break;
-                } else {
-                        free(msg);
-                }
-        } while (1);
+        while ( (msg = get_value(ptr, _("msg"), NULL)) ) {
+                free(ptr);
+                ptr = msg;
+        }
 #endif        
 
@@ -1231 +1225 @@
         if ( inet_peer_ip != NULL){
                 ret = idmef_target_new_node(target, &node);
+                if ( ret < 0 )
+                          goto err;
         
                 ret = node_set_address(node, inet_peer_ip); 
@@ -1239 +1235 @@
         }
         else
+#endif        
         if ( idmef_analyzer_get_node(prelude_client_get_analyzer(client)) ) {
                 idmef_node_ref(idmef_analyzer_get_node(prelude_client_get_analyzer(client)));
                 idmef_target_set_node(target, idmef_analyzer_get_node(prelude_client_get_analyzer(client)));
         }
-#else        
-        if ( idmef_analyzer_get_node(prelude_client_get_analyzer(client)) ) {
-                idmef_node_ref(idmef_analyzer_get_node(prelude_client_get_analyzer(client)));
-                idmef_target_set_node(target, idmef_analyzer_get_node(prelude_client_get_analyzer(client)));
-        }
-#endif        
+
         if ( strstr(message, _("path=")) ) {
 #if defined(SH_WITH_CLIENT) || defined(SH_STANDALONE)