Changeset 40 for trunk/src/sh_prelude.c

Timestamp:

May 31, 2006, 9:38:30 PM (18 years ago)

Author:

rainer

Message:

Fix for tickets #13, #14, #15, #16, #17

File:

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

trunk/src/sh_prelude.c

@@ -39 +39 @@
 #include <string.h>
 #include <sys/types.h>
-#include <sys/stat.h>
 
 #if TIME_WITH_SYS_TIME
@@ -56 +55 @@
 #endif
 
-#ifdef MAJOR_IN_MKDEV
-# include <sys/mkdev.h>
-#else
-# ifdef MAJOR_IN_SYSMACROS
-#  include <sys/sysmacros.h>
-# endif
-#endif
-
 #include <unistd.h>
 #include <syslog.h>
 #include <pwd.h>
-#include <grp.h>
 
 int     sh_argc_store;
@@ -412 +402 @@
                 if ( ptr ) {
                         ret = idmef_file_new_name(file, &str);
-                        if ( ret < 0 )
-                                return;
-                        
-                        prelude_string_set_dup(str, ptr + 1);
+                        if ( ret == 0 ) {
+                                prelude_string_set_dup(str, ptr + 1);
+                        }
                 }
         }
@@ -428 +417 @@
         if ( ptr ) {
                 ret = idmef_time_from_samhain(&time, ptr);
-                if ( ret < 0 ) {
-                        free(ptr);
-                        return;
-                }
-                
-                idmef_file_set_modify_time(file, time);
+                if ( ret == 0 ) {
+                        idmef_file_set_modify_time(file, time);
+                }
                 free(ptr);
         }
@@ -440 +426 @@
         if ( ptr ) {
                 ret = idmef_time_from_samhain(&time, ptr);
-                if ( ret < 0 ) {
-                        free(ptr);
-                        return;
-                }
-
-                idmef_file_set_create_time(file, time);
+                if ( ret == 0 ) {
+                        idmef_file_set_create_time(file, time);
+                }
                 free(ptr);
         }
@@ -451 +434 @@
         ptr = get_value(msg, _("inode"), suffix);
         if ( ptr ) {
-                struct stat st;
-
-                ret = lstat(prelude_string_get_string(idmef_file_get_path(file)), &st);
-                if ( ret < 0 ) {
-                        free(ptr);
-                        return;
-                }
-
                 ret = idmef_file_new_inode(file, &inode);
-                if ( ret < 0 ) {
-                        free(ptr);
-                        return;
-                }
-                
-                idmef_inode_set_major_device(inode, major(st.st_dev));
-                idmef_inode_set_minor_device(inode, minor(st.st_dev));
-                idmef_inode_set_number(inode, strtoul(ptr, NULL, 10));
+                if ( ret == 0 ) {
+                        char * dev = get_value(msg, _("dev"), suffix);
+                        if (dev) {
+                                char * q = strchr(dev, ',');
+                                if (*q) {
+                                         *q = '\0'; ++q;
+                                         idmef_inode_set_major_device(inode, strtoul(dev, NULL, 0));
+                                         idmef_inode_set_minor_device(inode, strtoul(  q, NULL, 0));
+                                }
+                                free(dev);
+                        }
+                        idmef_inode_set_number(inode, strtoul(ptr, NULL, 10));
+                }
                 free(ptr);
         }
@@ -475 +455 @@
                 ret = idmef_file_new_checksum(file, &checksum, IDMEF_LIST_APPEND);
                 if ( ret < 0 ) {
-                        free(ptr);
-                        return;
+                        free(ptr);
+                        goto get_mode;
                 }
 
@@ -482 +462 @@
 
                 if (hashtype == 0)
-                        idmef_checksum_set_algorithm(checksum, IDMEF_CHECKSUM_ALGORITHM_TIGER);
-
-                else if (hashtype == 1)
-                        idmef_checksum_set_algorithm(checksum, IDMEF_CHECKSUM_ALGORITHM_SHA1);
-
-                else if (hashtype == 2)
-                        idmef_checksum_set_algorithm(checksum, IDMEF_CHECKSUM_ALGORITHM_MD5);
-
-                else
-                        idmef_checksum_set_algorithm(checksum, IDMEF_CHECKSUM_ALGORITHM_TIGER);
-
-
-                ret = idmef_checksum_new_value(checksum, &str);
-                if ( ret < 0 ) {
-                        free(ptr);
-                        return;
+                        idmef_checksum_set_algorithm(checksum, IDMEF_CHECKSUM_ALGORITHM_TIGER);
+
+                else if (hashtype == 1)
+                        idmef_checksum_set_algorithm(checksum, IDMEF_CHECKSUM_ALGORITHM_SHA1);
+                
+                else if (hashtype == 2)
+                        idmef_checksum_set_algorithm(checksum, IDMEF_CHECKSUM_ALGORITHM_MD5);
+                
+                else
+                        idmef_checksum_set_algorithm(checksum, IDMEF_CHECKSUM_ALGORITHM_TIGER);
+
+
+                ret = idmef_checksum_new_value(checksum, &str);
+                if ( ret < 0 ) {
+                        free(ptr);
+                        goto get_mode;
                 }
 
                 /* will be freed on destroy()
                  */
-                prelude_string_set_nodup(str, ptr);
-        }
+                prelude_string_set_nodup(str, ptr);
+        }
+
+ get_mode:
 
         mode = get_value(msg, _("mode"), suffix);
@@ -510 +492 @@
                 ret = idmef_file_new_file_access(file, &access, IDMEF_LIST_APPEND);
                 if ( ret < 0 )
-                        goto mode_free;
+                        goto get_owner;
 
                 /* flawfinder: ignore *//* is part of name, not access() */
                 ret = idmef_file_access_new_user_id(access, &userid);
                 if ( ret < 0 )
-                        goto mode_free;
+                        goto get_owner;
                 idmef_user_id_set_type(userid, IDMEF_USER_ID_TYPE_OTHER_PRIVS);
 
@@ -521 +503 @@
                 get_access_info ( access, mode, 7, 9 );
         }
+
+ get_owner:
  
         ptr = get_value(msg, _("owner"), suffix);
         if ( ptr ) {
-                struct passwd *pw;
+                char * uid;
                 
                 /* flawfinder: ignore *//* is part of name, not access() */
@@ -530 +514 @@
                 if ( ret < 0 ) {
                         free(ptr);
-                        goto mode_free;
+                        goto get_group;
                 }
 
@@ -537 +521 @@
                 if ( ret < 0 ) {
                         free(ptr);
-                        goto mode_free;
+                        goto get_group;
                 }
                 idmef_user_id_set_type(userid, IDMEF_USER_ID_TYPE_USER_PRIVS);
@@ -544 +528 @@
                 if ( ret < 0 ) {
                         free(ptr);
-                        goto mode_free;
+                        goto get_group;
                 }
                 prelude_string_set_nodup(str, ptr);
                 
-                pw = getpwnam(ptr);
-                if ( ! pw )
-                        goto mode_free;
-                
-                idmef_user_id_set_number(userid, pw->pw_uid);
+                uid = get_value(msg, _("iowner"), suffix);
+                if ( ! uid )
+                        goto get_group;
+                
+                idmef_user_id_set_number(userid, strtoul(uid, NULL, 0));
 
                 if ( mode ) {
@@ -558 +542 @@
                         get_access_info ( access, mode, 1, 3 );
                 }
-        }
+
+                free(uid);
+        }
+
+ get_group:
 
         ptr = get_value(msg, _("group"), suffix);
         if ( ptr ) {
-                struct group *gr;
+                char *gid;
                 
                 /* flawfinder: ignore *//* is part of name, not access() */
@@ -587 +575 @@
                 prelude_string_set_nodup(str, ptr);
 
-                gr = getgrnam(ptr);
-                if ( ! gr )
+                gid = get_value(msg, _("igroup"), suffix);
+                if ( ! gid )
                         goto mode_free;
 
-                idmef_user_id_set_number(userid, gr->gr_gid);
+                idmef_user_id_set_number(userid, strtoul(gid, NULL, 0));
 
                 if ( mode ) {
                         get_access_info ( access, mode, 4, 6 ); /* flawfinder: ignore */
                 }
+
+                free(gid);
         }