summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2007-06-15 23:47:40 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:23:23 -0500
commit72099d8f66dc4db6ac8a7632cb17870ef63b18ef (patch)
treefd81c4231bd9a4066df97ea08979093c7a5254c3 /source3
parentb1ce226af8b61ad7e3c37860a59c6715012e738b (diff)
downloadsamba-72099d8f66dc4db6ac8a7632cb17870ef63b18ef.tar.gz
samba-72099d8f66dc4db6ac8a7632cb17870ef63b18ef.tar.bz2
samba-72099d8f66dc4db6ac8a7632cb17870ef63b18ef.zip
r23512: Fix conflict in #define for SECDESC_PREFIX. Ensure all
reg #defines use "REG_" prefix. Michael - please check gcc warnings on compiles. Jeremy. (This used to be commit 7885b68bb5df0ebe290feca0e74b4a20ef59e718)
Diffstat (limited to 'source3')
-rw-r--r--source3/include/reg_db.h4
-rw-r--r--source3/registry/reg_db.c10
2 files changed, 7 insertions, 7 deletions
diff --git a/source3/include/reg_db.h b/source3/include/reg_db.h
index 474b095b68..9a35f91e5d 100644
--- a/source3/include/reg_db.h
+++ b/source3/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/source3/registry/reg_db.c b/source3/registry/reg_db.c
index a8e5ea665a..f166467c50 100644
--- a/source3/registry/reg_db.c
+++ b/source3/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;
}