Changeset 988 for vendor/current/source3/lib/privileges.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/privileges.c (modified) (9 diffs)

vendor/current/source3/lib/privileges.c

@@ -24 +24 @@
 #include "includes.h"
 #include "lib/privileges.h"
-#include "dbwrap.h"
+#include "dbwrap/dbwrap.h"
 #include "libcli/security/privileges_private.h"
 #include "../libcli/security/security.h"
@@ -77 +77 @@
         fstring tmp, keystr;
         TDB_DATA data;
+        NTSTATUS status;
 
         /* Fail if the admin has not enable privileges */
@@ -91 +92 @@
         fstr_sprintf(keystr, "%s%s", PRIVPREFIX, sid_to_fstring(tmp, sid));
 
-        data = dbwrap_fetch_bystring( db, talloc_tos(), keystr );
-
-        if ( !data.dptr ) {
+        status = dbwrap_fetch_bystring(db, talloc_tos(), keystr, &data);
+
+        if (!NT_STATUS_IS_OK(status)) {
                 DEBUG(4, ("get_privileges: No privileges assigned to SID "
                           "[%s]\n", sid_string_dbg(sid)));
@@ -210 +211 @@
         struct dom_sid sid;
         fstring sid_string;
+        TDB_DATA key;
+
+        key = dbwrap_record_get_key(rec);
 
         /* check we have a PRIV_+SID entry */
 
-        if ( strncmp((char *)rec->key.dptr, PRIVPREFIX, prefixlen) != 0)
+        if (strncmp((char *)key.dptr, PRIVPREFIX, prefixlen) != 0)
                 return 0;
 
         /* check to see if we are looking for a particular privilege */
 
-        fstrcpy( sid_string, (char *)&(rec->key.dptr[strlen(PRIVPREFIX)]) );
+        fstrcpy( sid_string, (char *)&(key.dptr[strlen(PRIVPREFIX)]) );
 
         if (priv->privilege != 0) {
                 uint64_t mask;
-
-                if (rec->value.dsize == 4*4) {
-                        mask = map_old_SE_PRIV(rec->value.dptr);
+                TDB_DATA value;
+
+                value = dbwrap_record_get_value(rec);
+
+                if (value.dsize == 4*4) {
+                        mask = map_old_SE_PRIV(value.dptr);
                 } else {
-                        if (rec->value.dsize != sizeof( uint64_t ) ) {
+                        if (value.dsize != sizeof( uint64_t ) ) {
                                 DEBUG(3, ("get_privileges: Invalid privileges record assigned to SID "
                                           "[%s]\n", sid_string));
                                 return 0;
                         }
-                        mask = BVAL(rec->value.dptr, 0);
+                        mask = BVAL(value.dptr, 0);
                 }
 
@@ -265 +272 @@
 
 /*********************************************************************
- Retreive list of privileged SIDs (for _lsa_enumerate_accounts()
+ Retrieve list of privileged SIDs (for _lsa_enumerate_accounts()
 *********************************************************************/
 
@@ -272 +279 @@
         struct db_context *db = get_account_pol_db();
         PRIV_SID_LIST priv;
+        NTSTATUS status;
 
         if (db == NULL) {
@@ -279 +287 @@
         ZERO_STRUCT(priv);
 
-        db->traverse_read(db, priv_traverse_fn, &priv);
+        status = dbwrap_traverse_read(db, priv_traverse_fn, &priv, NULL);
+        if (!NT_STATUS_IS_OK(status)) {
+                return status;
+        }
 
         /* give the memory away; caller will free */
@@ -298 +309 @@
         struct db_context *db = get_account_pol_db();
         PRIV_SID_LIST priv;
+        NTSTATUS status;
 
         if (db == NULL) {
@@ -308 +320 @@
         priv.mem_ctx = mem_ctx;
 
-        db->traverse_read(db, priv_traverse_fn, &priv);
+        status = dbwrap_traverse_read(db, priv_traverse_fn, &priv, NULL);
+        if (!NT_STATUS_IS_OK(status)) {
+                return status;
+        }
 
         /* give the memory away; caller will free */