summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-08-23 03:22:25 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:34:23 -0500
commita92e61c4528b46628275216c9252a7a7f6e07dfc (patch)
tree51d6195b5f544e12132a6a41a5fd9c046c2c6f37 /source4
parent27a09eaaab1d147ecad069a0d6645ad5c1c393c6 (diff)
downloadsamba-a92e61c4528b46628275216c9252a7a7f6e07dfc.tar.gz
samba-a92e61c4528b46628275216c9252a7a7f6e07dfc.tar.bz2
samba-a92e61c4528b46628275216c9252a7a7f6e07dfc.zip
r9503: removed duplicate REG_* defines from registry.h now that they are
generated in winreg.h (This used to be commit fc15e1b003a2b24dc73a6a7f2bbc45e20373dda1)
Diffstat (limited to 'source4')
-rw-r--r--source4/include/registry.h16
-rw-r--r--source4/lib/registry/common/reg_util.c1
-rw-r--r--source4/lib/registry/reg_backend_ldb.c5
-rw-r--r--source4/lib/registry/tools/regpatch.c1
4 files changed, 5 insertions, 18 deletions
diff --git a/source4/include/registry.h b/source4/include/registry.h
index 488d4f4dc6..e472ed6a87 100644
--- a/source4/include/registry.h
+++ b/source4/include/registry.h
@@ -33,23 +33,7 @@
#define HKEY_PERFORMANCE_TEXT 0x80000050
#define HKEY_PERFORMANCE_NLSTEXT 0x80000060
-/* Registry data types */
-
#define REG_DELETE -1
-#define REG_NONE 0
-#define REG_SZ 1
-#define REG_EXPAND_SZ 2
-#define REG_BINARY 3
-#define REG_DWORD_LE 4
-#define REG_DWORD REG_DWORD_LE
-#define REG_DWORD_BE 5
-#define REG_LINK 6
-#define REG_MULTI_SZ 7
-#define REG_RESOURCE_LIST 8
-#define REG_FULL_RESOURCE_DESCRIPTOR 9
-#define REG_RESOURCE_REQUIREMENTS_LIST 10
-#define REG_QWORD_LE 11
-#define REG_QWORD REQ_QWORD_LE
#if 0
/* FIXME */
diff --git a/source4/lib/registry/common/reg_util.c b/source4/lib/registry/common/reg_util.c
index 2d933f2e6b..65f1167832 100644
--- a/source4/lib/registry/common/reg_util.c
+++ b/source4/lib/registry/common/reg_util.c
@@ -20,6 +20,7 @@
#include "includes.h"
#include "registry.h"
+#include "librpc/gen_ndr/winreg.h"
static const struct {
uint32_t id;
diff --git a/source4/lib/registry/reg_backend_ldb.c b/source4/lib/registry/reg_backend_ldb.c
index 404dab4dc1..76ad1facc1 100644
--- a/source4/lib/registry/reg_backend_ldb.c
+++ b/source4/lib/registry/reg_backend_ldb.c
@@ -22,6 +22,7 @@
#include "registry.h"
#include "lib/ldb/include/ldb.h"
#include "db_wrap.h"
+#include "librpc/gen_ndr/winreg.h"
struct ldb_key_data
{
@@ -51,7 +52,7 @@ static void reg_ldb_unpack_value(TALLOC_CTX *mem_ctx, struct ldb_message *msg, c
*len = convert_string_talloc(mem_ctx, CH_UTF8, CH_UTF16, val->data, val->length, data);
break;
- case REG_DWORD_LE:
+ case REG_DWORD:
*len = 4;
*data = talloc(mem_ctx, uint32_t);
SIVAL(*data, 0, strtol(val->data, NULL, 0));
@@ -78,7 +79,7 @@ static struct ldb_message *reg_ldb_pack_value(struct ldb_context *ctx, TALLOC_CT
val.length = convert_string_talloc(mem_ctx, CH_UTF16, CH_UTF8, data, len, &val.data);
ldb_msg_add_value(ctx, msg, "data", &val);
break;
- case REG_DWORD_LE:
+ case REG_DWORD:
ldb_msg_add_string(ctx, msg, "data", talloc_asprintf(mem_ctx, "0x%x", IVAL(data, 0)));
break;
default:
diff --git a/source4/lib/registry/tools/regpatch.c b/source4/lib/registry/tools/regpatch.c
index 3ada9f66e2..c2f01ce5b4 100644
--- a/source4/lib/registry/tools/regpatch.c
+++ b/source4/lib/registry/tools/regpatch.c
@@ -25,6 +25,7 @@
#include "registry.h"
#include "lib/cmdline/popt_common.h"
#include "system/filesys.h"
+#include "librpc/gen_ndr/winreg.h"
/*
* Routines to parse a REGEDIT4 file