Changeset 988 for vendor/current/source3/lib/sharesec.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/source3/lib/sharesec.c (modified) (23 diffs)

vendor/current/source3/lib/sharesec.c

@@ -22 +22 @@
 #include "../libcli/security/security.h"
 #include "../librpc/gen_ndr/ndr_security.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
+#include "dbwrap/dbwrap_open.h"
 #include "util_tdb.h"
 
@@ -41 +42 @@
 static int delete_fn(struct db_record *rec, void *priv)
 {
-        rec->delete_rec(rec);
+        dbwrap_record_delete(rec);
         return 0;
 }
@@ -58 +59 @@
         bool *p_upgrade_ok = (bool *)priv;
         NTSTATUS status;
+        TDB_DATA key;
+        TDB_DATA value;
+
+        key = dbwrap_record_get_key(rec);
 
         /* Is there space for a one character sharename ? */
-        if (rec->key.dsize <= prefix_len+2) {
+        if (key.dsize <= prefix_len+2) {
                 return 0;
         }
 
         /* Does it start with the share key prefix ? */
-        if (memcmp(rec->key.dptr, SHARE_SECURITY_DB_KEY_PREFIX_STR,
+        if (memcmp(key.dptr, SHARE_SECURITY_DB_KEY_PREFIX_STR,
                         prefix_len) != 0) {
                 return 0;
@@ -71 +76 @@
 
         /* Is it a null terminated string as a key ? */
-        if (rec->key.dptr[rec->key.dsize-1] != '\0') {
+        if (key.dptr[key.dsize-1] != '\0') {
                 return 0;
         }
 
         /* Bytes after the prefix are the sharename string. */
-        servicename = (char *)&rec->key.dptr[prefix_len];
+        servicename = (char *)&key.dptr[prefix_len];
         c_servicename = canonicalize_servicename(talloc_tos(), servicename);
         if (!c_servicename) {
@@ -89 +94 @@
 
         /* Oops. Need to canonicalize name, delete old then store new. */
-        status = rec->delete_rec(rec);
+        status = dbwrap_record_delete(rec);
         if (!NT_STATUS_IS_OK(status)) {
                 DEBUG(1, ("upgrade_v2_to_v3: Failed to delete secdesc for "
-                          "%s: %s\n", rec->key.dptr, nt_errstr(status)));
+                          "%s: %s\n", (const char *)key.dptr,
+                          nt_errstr(status)));
                 TALLOC_FREE(c_servicename);
                 *p_upgrade_ok = false;
@@ -98 +104 @@
         } else {
                 DEBUG(10, ("upgrade_v2_to_v3: deleted secdesc for "
-                          "%s\n", rec->key.dptr ));
+                          "%s\n", (const char *)key.dptr));
         }
 
@@ -107 +113 @@
         }
 
+        value = dbwrap_record_get_value(rec);
         status = dbwrap_store(share_db,
                                 string_term_tdb_data(newkey),
-                                rec->value,
+                                value,
                                 TDB_REPLACE);
 
@@ -133 +140 @@
 {
         const char *vstring = "INFO/version";
-        int32 vers_id;
-        int ret;
+        int32_t vers_id = 0;
         bool upgrade_ok = true;
+        NTSTATUS status;
+        char *db_path;
 
         if (share_db != NULL) {
@@ -141 +149 @@
         }
 
-        share_db = db_open(NULL, state_path("share_info.tdb"), 0,
-                                 TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+        db_path = state_path("share_info.tdb");
+        if (db_path == NULL) {
+                return false;
+        }
+
+        share_db = db_open(NULL, db_path, 0,
+                           TDB_DEFAULT, O_RDWR|O_CREAT, 0600,
+                           DBWRAP_LOCK_ORDER_1, DBWRAP_FLAG_NONE);
         if (share_db == NULL) {
                 DEBUG(0,("Failed to open share info database %s (%s)\n",
-                        state_path("share_info.tdb"), strerror(errno) ));
+                         db_path, strerror(errno)));
+                TALLOC_FREE(db_path);
                 return False;
         }
-
-        vers_id = dbwrap_fetch_int32(share_db, vstring);
+        TALLOC_FREE(db_path);
+
+        status = dbwrap_fetch_int32_bystring(share_db, vstring, &vers_id);
+        if (!NT_STATUS_IS_OK(status)) {
+                vers_id = 0;
+        }
+
         if (vers_id == SHARE_DATABASE_VERSION_V3) {
                 return true;
         }
 
-        if (share_db->transaction_start(share_db) != 0) {
+        if (dbwrap_transaction_start(share_db) != 0) {
                 DEBUG(0, ("transaction_start failed\n"));
                 TALLOC_FREE(share_db);
@@ -160 +180 @@
         }
 
-        vers_id = dbwrap_fetch_int32(share_db, vstring);
+        status = dbwrap_fetch_int32_bystring(share_db, vstring, &vers_id);
+        if (!NT_STATUS_IS_OK(status)) {
+                vers_id = 0;
+        }
+
         if (vers_id == SHARE_DATABASE_VERSION_V3) {
                 /*
                  * Race condition
                  */
-                if (share_db->transaction_cancel(share_db)) {
+                if (dbwrap_transaction_cancel(share_db)) {
                         smb_panic("transaction_cancel failed");
                 }
@@ -177 +201 @@
                 /* Written on a bigendian machine with old fetch_int code. Save as le. */
 
-                if (dbwrap_store_int32(share_db, vstring,
-                                       SHARE_DATABASE_VERSION_V2) != 0) {
-                        DEBUG(0, ("dbwrap_store_int32 failed\n"));
+                status = dbwrap_store_int32_bystring(
+                        share_db, vstring, SHARE_DATABASE_VERSION_V2);
+                if (!NT_STATUS_IS_OK(status)) {
+                        DEBUG(0, ("dbwrap_store_int32 failed: %s\n",
+                                  nt_errstr(status)));
                         goto cancel;
                 }
@@ -186 +212 @@
 
         if (vers_id != SHARE_DATABASE_VERSION_V2) {
-                ret = share_db->traverse(share_db, delete_fn, NULL);
-                if (ret < 0) {
+                status = dbwrap_traverse(share_db, delete_fn, NULL, NULL);
+                if (!NT_STATUS_IS_OK(status)) {
                         DEBUG(0, ("traverse failed\n"));
                         goto cancel;
                 }
-                if (dbwrap_store_int32(share_db, vstring,
-                                       SHARE_DATABASE_VERSION_V2) != 0) {
-                        DEBUG(0, ("dbwrap_store_int32 failed\n"));
+                status = dbwrap_store_int32_bystring(
+                        share_db, vstring, SHARE_DATABASE_VERSION_V2);
+                if (!NT_STATUS_IS_OK(status)) {
+                        DEBUG(0, ("dbwrap_store_int32 failed: %s\n",
+                                  nt_errstr(status)));
                         goto cancel;
                 }
@@ -200 +228 @@
         /* Finally upgrade to version 3, with canonicalized sharenames. */
 
-        ret = share_db->traverse(share_db, upgrade_v2_to_v3, &upgrade_ok);
-        if (ret < 0 || upgrade_ok == false) {
+        status = dbwrap_traverse(share_db, upgrade_v2_to_v3, &upgrade_ok, NULL);
+        if (!NT_STATUS_IS_OK(status) || upgrade_ok == false) {
                 DEBUG(0, ("traverse failed\n"));
                 goto cancel;
         }
-        if (dbwrap_store_int32(share_db, vstring,
-                               SHARE_DATABASE_VERSION_V3) != 0) {
-                DEBUG(0, ("dbwrap_store_int32 failed\n"));
+        status = dbwrap_store_int32_bystring(
+                share_db, vstring, SHARE_DATABASE_VERSION_V3);
+        if (!NT_STATUS_IS_OK(status)) {
+                DEBUG(0, ("dbwrap_store_int32 failed: %s\n",
+                          nt_errstr(status)));
                 goto cancel;
         }
 
-        if (share_db->transaction_commit(share_db) != 0) {
+        if (dbwrap_transaction_commit(share_db) != 0) {
                 DEBUG(0, ("transaction_commit failed\n"));
                 return false;
@@ -219 +249 @@
 
  cancel:
-        if (share_db->transaction_cancel(share_db)) {
+        if (dbwrap_transaction_cancel(share_db)) {
                 smb_panic("transaction_cancel failed");
         }
@@ -231 +261 @@
  ********************************************************************/
 
-struct security_descriptor *get_share_security_default( TALLOC_CTX *ctx, size_t *psize, uint32 def_access)
+struct security_descriptor *get_share_security_default( TALLOC_CTX *ctx, size_t *psize, uint32_t def_access)
 {
         uint32_t sa;
@@ -237 +267 @@
         struct security_acl *psa = NULL;
         struct security_descriptor *psd = NULL;
-        uint32 spec_access = def_access;
+        uint32_t spec_access = def_access;
 
         se_map_generic(&spec_access, &file_generic_mapping);
@@ -288 +318 @@
         TALLOC_FREE(c_servicename);
 
-        data = dbwrap_fetch_bystring(share_db, talloc_tos(), key);
+        status = dbwrap_fetch_bystring(share_db, talloc_tos(), key, &data);
 
         TALLOC_FREE(key);
 
-        if (data.dptr == NULL) {
+        if (!NT_STATUS_IS_OK(status)) {
                 return get_share_security_default(ctx, psize,
-                                                  GENERIC_ALL_ACCESS);
+                                                  SEC_RIGHTS_DIR_ALL);
         }
 
@@ -302 +332 @@
 
         if (!NT_STATUS_IS_OK(status)) {
-                DEBUG(0, ("unmarshall_sec_desc failed: %s\n",
-                          nt_errstr(status)));
                 return get_share_security_default(ctx, psize,
-                                                  GENERIC_ALL_ACCESS);
+                                                  SEC_RIGHTS_DIR_ALL);
         }
 
@@ -312 +340 @@
         } else {
                 return get_share_security_default(ctx, psize,
-                                                  GENERIC_ALL_ACCESS);
+                                                  SEC_RIGHTS_DIR_ALL);
         }
 
@@ -413 +441 @@
 bool share_access_check(const struct security_token *token,
                         const char *sharename,
-                        uint32 desired_access,
+                        uint32_t desired_access,
                         uint32_t *pgranted)
 {
-        uint32 granted;
+        uint32_t granted;
         NTSTATUS status;
         struct security_descriptor *psd = NULL;
@@ -424 +452 @@
 
         if (!psd) {
-                return True;
-        }
-
-        status = se_access_check(psd, token, desired_access, &granted);
+                if (pgranted != NULL) {
+                        *pgranted = desired_access;
+                }
+                return false;
+        }
+
+        status = se_file_access_check(psd, token, true, desired_access, &granted);
 
         TALLOC_FREE(psd);
@@ -470 +501 @@
         num_aces += count_chars(pacl,',');
 
-        ace_list = TALLOC_ARRAY(ctx, struct security_ace, num_aces);
+        ace_list = talloc_array(ctx, struct security_ace, num_aces);
         if (!ace_list) {
                 return False;
@@ -477 +508 @@
         for (i = 0; i < num_aces; i++) {
                 uint32_t sa;
-                uint32 g_access;
-                uint32 s_access;
+                uint32_t g_access;
+                uint32_t s_access;
                 struct dom_sid sid;
                 char *sidstr;