r23468: Open registry.tdb with sequence number.

[sfrench/samba-autobuild/.git] / source / registry / reg_db.c

diff --git a/source/registry/reg_db.c b/source/registry/reg_db.c
index 224dd7e0f6844460cde899b7759f0b6896681371..555ae6adda325b10de103a46d128ae8e1d91cc90 100644 (file)
--- a/source/registry/reg_db.c
+++ b/source/registry/reg_db.c
@@ -31,6 +31,8 @@ static int tdb_refcount;
 #define VALUE_PREFIX   "SAMBA_REGVAL"
 #define SECDESC_PREFIX  "SAMBA_SECDESC"
 
+#define REG_TDB_FLAGS TDB_SEQNUM
+
 /* List the deepest path into the registry.  All part components will be created.*/
 
 /* If you want to have a part of the path controlled by the tdb and part by
@@ -236,9 +238,9 @@ BOOL regdb_init( void )
        if ( tdb_reg )
                return True;
 
-       if ( !(tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600)) )
+       if ( !(tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0, REG_TDB_FLAGS, O_RDWR, 0600)) )
        {
-               tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR|O_CREAT, 0600);
+               tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0, REG_TDB_FLAGS, O_RDWR|O_CREAT, 0600);
                if ( !tdb_reg ) {
                        DEBUG(0,("regdb_init: Failed to open registry %s (%s)\n",
                                lock_path("registry.tdb"), strerror(errno) ));
@@ -283,7 +285,7 @@ WERROR regdb_open( void )
        
        become_root();
 
-       tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0, TDB_DEFAULT, O_RDWR, 0600);
+       tdb_reg = tdb_open_log(lock_path("registry.tdb"), 0, REG_TDB_FLAGS, O_RDWR, 0600);
        if ( !tdb_reg ) {
                result = ntstatus_to_werror( map_nt_error_from_unix( errno ) );
                DEBUG(0,("regdb_open: Failed to open %s! (%s)\n", 
@@ -320,6 +322,16 @@ int regdb_close( void )
        return ret;
 }
 
+/***********************************************************************
+ return the tdb sequence number of the registry tdb.
+ this is an indicator for the content of the registry
+ having changed. it will change upon regdb_init, too, though.
+ ***********************************************************************/
+int regdb_get_seqnum(void)
+{
+       return tdb_get_seqnum(tdb_reg);
+}
+
 /***********************************************************************
  Add subkey strings to the registry tdb under a defined key
  fmt is the same format as tdb_pack except this function only supports
@@ -470,7 +482,7 @@ BOOL regdb_store_keys( const char *key, REGSUBKEY_CTR *ctr )
                        /* create a record with 0 subkeys */
                        if ( !regdb_store_keys_internal( path, subkeys ) ) {
                                DEBUG(0,("regdb_store_keys: Failed to store "
-                                        "new record for key [%s}\n", path ));
+                                        "new record for key [%s]\n", path ));
                                goto fail;
                        }
                }
@@ -756,7 +768,7 @@ static WERROR regdb_set_secdesc(const char *key,
        normalize_dbkey(tdbkey);
 
        err = ntstatus_to_werror(marshall_sec_desc(mem_ctx, secdesc,
-                                                  (uint8 **)&tdbdata.dptr,
+                                                  &tdbdata.dptr,
                                                   &tdbdata.dsize));
        if (!W_ERROR_IS_OK(err)) {
                goto done;