r23512: Fix conflict in #define for SECDESC_PREFIX. Ensure all

reg #defines use "REG_" prefix. Michael - please check
gcc warnings on compiles.
Jeremy.

diff --git a/source/include/reg_db.h b/source/include/reg_db.h
index 474b095b68c36be5e174005011a8fc408c8d2721..9a35f91e5dce08d65714e6f13a272ada6a59a0f3 100644 (file)
--- a/source/include/reg_db.h
+++ b/source/include/reg_db.h
@@ -25,7 +25,7 @@
 
 #define REGVER_V1       1       /* first db version with write support */
 
-#define VALUE_PREFIX    "SAMBA_REGVAL"
-#define SECDESC_PREFIX  "SAMBA_SECDESC"
+#define REG_VALUE_PREFIX    "SAMBA_REGVAL"
+#define REG_SECDESC_PREFIX  "SAMBA_SECDESC"
 
 #endif /* _REG_DB_H */

diff --git a/source/registry/reg_db.c b/source/registry/reg_db.c
index a8e5ea665a4ba069f84c32ff08aa5e491fed9c38..f166467c50bc0f65d2e41ff4ff28f9f167ad5d97 100644 (file)
--- a/source/registry/reg_db.c
+++ b/source/registry/reg_db.c
@@ -444,7 +444,7 @@ BOOL regdb_store_keys( const char *key, REGSUBKEY_CTR *ctr )
                        goto fail;
                }
                
-               pstr_sprintf( path, "%s/%s/%s", VALUE_PREFIX, key,
+               pstr_sprintf( path, "%s/%s/%s", REG_VALUE_PREFIX, key,
                              oldkeyname );
                normalize_reg_path( path );
 
@@ -637,7 +637,7 @@ int regdb_fetch_values( const char* key, REGVAL_CTR *values )
 
        DEBUG(10,("regdb_fetch_values: Looking for value of key [%s] \n", key));
        
-       pstr_sprintf( keystr, "%s/%s", VALUE_PREFIX, key );
+       pstr_sprintf( keystr, "%s/%s", REG_VALUE_PREFIX, key );
        normalize_reg_path( keystr );
        
        data = tdb_fetch_bystring( tdb_reg->tdb, keystr );
@@ -682,7 +682,7 @@ BOOL regdb_store_values( const char *key, REGVAL_CTR *values )
        
        SMB_ASSERT( len == data.dsize );
        
-       pstr_sprintf( keystr, "%s/%s", VALUE_PREFIX, key );
+       pstr_sprintf( keystr, "%s/%s", REG_VALUE_PREFIX, key );
        normalize_reg_path( keystr );
        
        ret = tdb_trans_store_bystring(tdb_reg->tdb, keystr, data, TDB_REPLACE);
@@ -701,7 +701,7 @@ static WERROR regdb_get_secdesc(TALLOC_CTX *mem_ctx, const char *key,
 
        DEBUG(10, ("regdb_get_secdesc: Getting secdesc of key [%s]\n", key));
 
-       if (asprintf(&tdbkey, "%s/%s", SECDESC_PREFIX, key) == -1) {
+       if (asprintf(&tdbkey, "%s/%s", REG_SECDESC_PREFIX, key) == -1) {
                return WERR_NOMEM;
        }
        normalize_dbkey(tdbkey);
@@ -744,7 +744,7 @@ static WERROR regdb_set_secdesc(const char *key,
 
        ZERO_STRUCT(ps);
 
-       if (!(tdbkey = talloc_asprintf(mem_ctx, "%s/%s", SECDESC_PREFIX,
+       if (!(tdbkey = talloc_asprintf(mem_ctx, "%s/%s", REG_SECDESC_PREFIX,
                                       key))) {
                goto done;
        }