Changeset 212 for trunk/src/sh_hash.c

Timestamp:

Feb 17, 2009, 10:37:42 PM (16 years ago)

Author:

katerina

Message:

Lock baseline database (ticket #139) and allow list as input for PortCheckInterface (ticket #140).

File:

• trunk/src/sh_hash.c (modified) (4 diffs)

trunk/src/sh_hash.c

@@ -1552 +1552 @@
               sh_error_handle((-1), FIL__, __LINE__, pushdata_fd, MSG_E_ACCESS,
                               geteuid(), file_path('D', 'W'));
-              SL_RET0(_("sh_hash_pushdata_int"));
+              aud_exit(FIL__, __LINE__, EXIT_FAILURE);
             }
+
+          if (SL_ISERROR(status = sl_lock (pushdata_fd)))
+            {
+              SH_FREE(fullpath);
+              SH_FREE(linkpath);
+              sh_error_handle((-1), FIL__, __LINE__, status, MSG_E_SUBGPATH,
+                              _("Failed to lock baseline database"), _("sh_hash_pushdata_int"),
+                              file_path('D', 'W'));
+              aud_exit(FIL__, __LINE__, EXIT_FAILURE);
+            }
+
           if ( SL_ISERROR(status = sl_forward(pushdata_fd))) 
             {
@@ -1559 +1570 @@
               SH_FREE(linkpath);
               sh_error_handle((-1), FIL__, __LINE__, status, MSG_E_SUBGPATH,
-                              _("Fast forward failed"), _("sh_hash_pushdata_int"),
+                              _("Failed to seek to end of baseline database"), _("sh_hash_pushdata_int"),
                               file_path('D', 'W'));
-              SL_RET0(_("sh_hash_pushdata_int"));
+              aud_exit(FIL__, __LINE__, EXIT_FAILURE);
             }
         }
@@ -1570 +1581 @@
         {
           TPT((0, FIL__, __LINE__, _("msg=<Update.>\n")))
-          if ( SL_ISERROR(pushdata_fd = sl_open_rdwr(file_path('D', 'W'), SL_YESPRIV))){
-            SH_FREE(fullpath);
-            SH_FREE(linkpath);
-            sh_error_handle((-1), FIL__, __LINE__, pushdata_fd, MSG_E_ACCESS,
-                            geteuid(), file_path('D', 'W'));
-            SL_RET0(_("sh_hash_pushdata_int"));
-          }
+            if ( SL_ISERROR(pushdata_fd = sl_open_rdwr(file_path('D', 'W'), SL_YESPRIV))){
+              SH_FREE(fullpath);
+              SH_FREE(linkpath);
+              sh_error_handle((-1), FIL__, __LINE__, pushdata_fd, MSG_E_ACCESS,
+                              geteuid(), file_path('D', 'W'));
+              aud_exit(FIL__, __LINE__, EXIT_FAILURE);
+            }
+
+          if (SL_ISERROR(status = sl_lock (pushdata_fd)))
+            {
+              SH_FREE(fullpath);
+              SH_FREE(linkpath);
+              sh_error_handle((-1), FIL__, __LINE__, status, MSG_E_SUBGPATH,
+                              _("Failed to lock baseline database"), _("sh_hash_pushdata_int"),
+                              file_path('D', 'W'));
+              aud_exit(FIL__, __LINE__, EXIT_FAILURE);
+            }
+
           line = SH_ALLOC(MAX_PATH_STORE+1);
           if (SL_ISERROR(sh_hash_setdataent_old (pushdata_fd, line, 
@@ -1585 +1607 @@
               SH_FREE(linkpath);
               SH_FREE(line);
-              SL_RET0(_("sh_hash_pushdata_int"));
+              aud_exit(FIL__, __LINE__, EXIT_FAILURE);
             }
           SH_FREE(line);