Changeset 740 for vendor/current/source3/registry/regfio.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source3/registry/regfio.c (modified) (10 diffs)

vendor/current/source3/registry/regfio.c

@@ -19 +19 @@
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "regfio.h"
+#include "../librpc/gen_ndr/ndr_security.h"
+#include "../libcli/security/security_descriptor.h"
 
 #undef DBGC_CLASS
@@ -30 +33 @@
  ******************************************************************/
 
+#if defined(PARANOID_MALLOC_CHECKER)
+#define PRS_ALLOC_MEM(ps, type, count) (type *)prs_alloc_mem_((ps),sizeof(type),(count))
+#else
+#define PRS_ALLOC_MEM(ps, type, count) (type *)prs_alloc_mem((ps),sizeof(type),(count))
+#endif
+
+/*******************************************************************
+ Reads or writes an NTTIME structure.
+********************************************************************/
+
+static bool smb_io_time(const char *desc, NTTIME *nttime, prs_struct *ps, int depth)
+{
+        uint32 low, high;
+        if (nttime == NULL)
+                return False;
+
+        prs_debug(ps, depth, desc, "smb_io_time");
+        depth++;
+
+        if(!prs_align(ps))
+                return False;
+
+        if (MARSHALLING(ps)) {
+                low = *nttime & 0xFFFFFFFF;
+                high = *nttime >> 32;
+        }
+
+        if(!prs_uint32("low ", ps, depth, &low)) /* low part */
+                return False;
+        if(!prs_uint32("high", ps, depth, &high)) /* high part */
+                return False;
+
+        if (UNMARSHALLING(ps)) {
+                *nttime = (((uint64_t)high << 32) + low);
+        }
+
+        return True;
+}
 
 /*******************************************************************
@@ -954 +995 @@
 *******************************************************************/
 
-static REGF_SK_REC* find_sk_record_by_sec_desc( REGF_FILE *file, SEC_DESC *sd )
+static REGF_SK_REC* find_sk_record_by_sec_desc( REGF_FILE *file, struct security_descriptor *sd )
 {
         REGF_SK_REC *p;
@@ -1438 +1479 @@
 
         hbin->free_off       = HBIN_HEADER_REC_SIZE;
-        hbin->free_size      = block_size - hbin->free_off + sizeof(uint32);;
+        hbin->free_size      = block_size - hbin->free_off + sizeof(uint32);
 
         hbin->block_size     = block_size;
@@ -1568 +1609 @@
 *******************************************************************/
 
-static uint32 sk_record_data_size( SEC_DESC * sd )
+static uint32 sk_record_data_size( struct security_descriptor * sd )
 {
         uint32 size, size_mod8;
@@ -1576 +1617 @@
         /* the record size is sizeof(hdr) + name + static members + data_size_field */
 
-        size = sizeof(uint32)*5 + ndr_size_security_descriptor(sd, NULL, 0) + sizeof(uint32);
+        size = sizeof(uint32)*5 + ndr_size_security_descriptor(sd, 0) + sizeof(uint32);
 
         /* multiple of 8 */
@@ -1718 +1759 @@
  REGF_NK_REC* regfio_write_key( REGF_FILE *file, const char *name,
                                struct regval_ctr *values, struct regsubkey_ctr *subkeys,
-                               SEC_DESC *sec_desc, REGF_NK_REC *parent )
+                               struct security_descriptor *sec_desc, REGF_NK_REC *parent )
 {
         REGF_NK_REC *nk;
@@ -1768 +1809 @@
 
                 /* sort the list by keyname */
-
-                qsort( parent->subkeys.hashes, parent->subkey_index, sizeof(REGF_HASH_REC), QSORT_CAST hashrec_cmp );
+                TYPESAFE_QSORT(parent->subkeys.hashes, parent->subkey_index, hashrec_cmp);
 
                 if ( !hbin_prs_lf_records( "lf_rec", parent->subkeys.hbin, 0, parent ) )
@@ -1807 +1847 @@
                         
                         /* size value must be self-inclusive */
-                        nk->sec_desc->size      = ndr_size_security_descriptor(sec_desc, NULL, 0)
+                        nk->sec_desc->size      = ndr_size_security_descriptor(sec_desc, 0)
                                 + sizeof(uint32);
 
@@ -1816 +1856 @@
                            offsets to ourself. */
 
-                        if ( nk->sec_desc->prev ) {
-                                REGF_SK_REC *prev = nk->sec_desc->prev;
+                        if ( DLIST_PREV(nk->sec_desc) ) {
+                                REGF_SK_REC *prev = DLIST_PREV(nk->sec_desc);
 
                                 nk->sec_desc->prev_sk_off = prev->hbin_off + prev->hbin->first_hbin_off - HBIN_HDR_SIZE;