Rev 11190: Remove the creg backend: in
file:///home/jelmer/bzr.samba-old/4.0-regwrite/
Jelmer Vernooij
jelmer at samba.org
Wed Jun 13 17:37:30 GMT 2007
At file:///home/jelmer/bzr.samba-old/4.0-regwrite/
------------------------------------------------------------
revno: 11190
revision-id: jelmer at samba.org-20070612234637-779h4pffu0ybx829
parent: jelmer at samba.org-20070612231137-i8mbl1sgmcfkb5vn
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 4.0-regwrite
timestamp: Wed 2007-06-13 01:46:37 +0200
message:
Remove the creg backend:
- it is not very relevant
- doesn't implement the full data model (classname and security descriptors are missing)
- was only partially implemented anyway (no write support, for example)
removed:
source/lib/registry/creg.c svn-v2:4132 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2fregistry%2freg_backend_w95.c
modified:
source/lib/registry/README svn-v2:4132 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2fregistry%2fREADME
source/lib/registry/config.mk svn-v2:851 at 0c0555d6-39d7-0310-84fc-f1cc0bd64818-branches%2fSAMBA_4_0-source%2flib%2fregistry%2fconfig.mk
source/lib/registry/hive.c hive.c-20070602140117-9a3wth1mhbrq7ej1-1
source/lib/registry/hive.h hive.h-20070423140448-w1nvzs8d2qxvyswz-1
=== removed file 'source/lib/registry/creg.c'
--- a/source/lib/registry/creg.c 2007-06-12 16:54:40 +0000
+++ b/source/lib/registry/creg.c 1970-01-01 00:00:00 +0000
@@ -1,375 +0,0 @@
-/*
- Samba Unix/Linux SMB client utility libeditreg.c
- Copyright (C) 2004-2007 Jelmer Vernooij, jelmer at samba.org
-
- Backend for Windows '95 registry files. Explanation of file format
- comes from http://www.cs.mun.ca/~michael/regutils/.
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-
-#include "includes.h"
-#include "hive.h"
-#include "system/filesys.h"
-#include "system/shmem.h"
-
-/**
- * The registry starts with a header that contains pointers to
- * the rgdb.
- *
- * After the main header follows the RGKN header (key index table).
- * The RGKN keys are listed after each other. They are put into
- * blocks, the first having a length of 0x2000 bytes, the others
- * being 0x1000 bytes long.
- *
- * After the RGKN header follow one or more RGDB blocks. These blocks
- * contain keys. A key is followed by its name and its values.
- *
- * Values are followed by their name and then their data.
- *
- * Basically the idea is that the RGKN contains the associations between
- * the keys and the RGDB contains the actual data.
- */
-
-typedef uint32_t DWORD;
-typedef unsigned short WORD;
-
-typedef struct creg_block {
- DWORD CREG_ID; /* CREG */
- DWORD uk1;
- DWORD rgdb_offset;
- DWORD chksum;
- WORD num_rgdb;
- WORD flags;
- DWORD uk2;
- DWORD uk3;
- DWORD uk4;
-} CREG_HDR;
-
-typedef struct rgkn_block {
- DWORD RGKN_ID; /* RGKN */
- DWORD size;
- DWORD root_offset;
- DWORD free_offset;
- DWORD flags;
- DWORD chksum;
- DWORD uk1;
- DWORD uk2;
-} RGKN_HDR;
-
-typedef struct reg_id {
- WORD id;
- WORD rgdb;
-} REG_ID;
-
-typedef struct rgkn_key {
- DWORD type; /* 0x00000000 = normal key, 0x80000000 = free block */
- DWORD hash; /* Contains either hash or size of free blocks that follows */
- DWORD next_free;
- DWORD parent_offset;
- DWORD first_child_offset;
- DWORD next_offset;
- REG_ID id;
-} RGKN_KEY;
-
-typedef struct rgdb_block {
- DWORD RGDB_ID; /* RGDB */
- DWORD size;
- DWORD unused_size;
- WORD flags;
- WORD section;
- DWORD free_offset; /* -1 if there is no free space */
- WORD max_id;
- WORD first_free_id;
- DWORD uk1;
- DWORD chksum;
-} RGDB_HDR;
-
-typedef struct rgdb_key {
- DWORD size;
- REG_ID id;
- DWORD used_size;
- WORD name_len;
- WORD num_values;
- DWORD uk1;
-} RGDB_KEY;
-
-typedef struct rgdb_value {
- DWORD type;
- DWORD uk1;
- WORD name_len;
- WORD data_len;
-} RGDB_VALUE;
-
-typedef struct creg_struct_s {
- int fd;
- BOOL modified;
- char *base;
- struct stat sbuf;
- CREG_HDR *creg_hdr;
- RGKN_HDR *rgkn_hdr;
- RGDB_KEY ***rgdb_keys;
-} CREG;
-
-struct creg_key_data {
- struct hive_key key;
- RGKN_KEY *data;
- CREG *hive;
-};
-
-#if 0 /* unused */
-#define RGKN_START_SIZE 0x2000
-#define RGKN_INC_SIZE 0x1000
-#endif
-
-#define LOCN_RGKN(creg, o) ((RGKN_KEY *)((creg)->base + sizeof(CREG_HDR) + o))
-#define LOCN_RGDB_BLOCK(creg, o) (((creg)->base + (creg)->creg_hdr->rgdb_offset + o))
-#define LOCN_RGDB_KEY(creg, rgdb, id) ((RGDB_KEY *)((creg)->rgdb_keys[(rgdb)][(id)]))
-
-static DWORD str_to_dword(const char *a) {
- int i;
- unsigned long ret = 0;
- for(i = strlen(a)-1; i >= 0; i--) {
- ret = ret * 0x100 + a[i];
- }
- return ret;
-}
-
-#if 0 /* unused */
-
-static DWORD calc_hash(const char *str) {
- DWORD ret = 0;
- int i;
- for(i = 0; str[i] && str[i] != '\\'; i++) {
- ret+=toupper(str[i]);
- }
- return ret;
-}
-
-static void parse_rgkn_block(CREG *creg, off_t start_off, off_t end_off)
-{
- off_t i;
- for(i = start_off; end_off - i > sizeof(RGKN_KEY); i+= sizeof(RGKN_KEY)) {
- RGKN_KEY *key = (RGKN_KEY *)LOCN_RGKN(creg, i);
- if(key->type == 0) {
- DEBUG(4,("Regular, id: %d, %d, parent: %x, firstchild: %x, next: %x hash: %lX\n", key->id.id, key->id.rgdb, key->parent_offset, key->first_child_offset, key->next_offset, (long)key->hash));
- } else if(key->type == 0x80000000) {
- DEBUG(3,("free\n"));
- i += key->hash;
- } else {
- DEBUG(0,("Invalid key type in RGKN: %0X\n", key->type));
- }
- }
-}
-
-#endif
-
-static void parse_rgdb_block(CREG *creg, RGDB_HDR *rgdb_hdr)
-{
- DWORD used_size = rgdb_hdr->size - rgdb_hdr->unused_size;
- DWORD offset = 0;
-
- while(offset < used_size) {
- RGDB_KEY *key = (RGDB_KEY *)(((char *)rgdb_hdr) + sizeof(RGDB_HDR) + offset);
-
- if(!(key->id.id == 0xFFFF && key->id.rgdb == 0xFFFF))creg->rgdb_keys[key->id.rgdb][key->id.id] = key;
- offset += key->size;
- }
-}
-
-WERROR reg_open_creg_file(TALLOC_CTX *parent_ctx, const char *location,
- struct hive_key **root)
-{
- CREG *creg;
- DWORD creg_id, rgkn_id;
- DWORD i;
- DWORD offset;
- struct creg_key_data *creg_root;
-
- creg = talloc(parent_ctx, CREG);
- memset(creg, 0, sizeof(CREG));
-
- if((creg->fd = open(location, O_RDONLY, 0000)) < 0) {
- return WERR_FOOBAR;
- }
-
- if (fstat(creg->fd, &creg->sbuf) < 0) {
- return WERR_FOOBAR;
- }
-
- creg->base = mmap(0, creg->sbuf.st_size, PROT_READ, MAP_SHARED, creg->fd, 0);
-
- if (creg->base == (void *)-1) {
- DEBUG(0,("Could not mmap file: %s, %s\n", location, strerror(errno)));
- return WERR_FOOBAR;
- }
-
- creg->creg_hdr = (CREG_HDR *)creg->base;
-
- if ((creg_id = IVAL(&creg->creg_hdr->CREG_ID,0)) != str_to_dword("CREG")) {
- DEBUG(0, ("Unrecognized Windows 95 registry header id: 0x%0X, %s\n",
- creg_id, location));
- return WERR_FOOBAR;
- }
-
- creg->rgkn_hdr = (RGKN_HDR *)LOCN_RGKN(creg, 0);
-
- if ((rgkn_id = IVAL(&creg->rgkn_hdr->RGKN_ID,0)) != str_to_dword("RGKN")) {
- DEBUG(0, ("Unrecognized Windows 95 registry key index id: 0x%0X, %s\n",
- rgkn_id, location));
- return WERR_FOOBAR;
- }
-
-#if 0
- /* If'ed out because we only need to parse this stuff when allocating new
- * entries (which we don't do at the moment */
- /* First parse the 0x2000 long block */
- parse_rgkn_block(creg, sizeof(RGKN_HDR), 0x2000);
-
- /* Then parse the other 0x1000 length blocks */
- for(offset = 0x2000; offset < creg->rgkn_hdr->size; offset+=0x1000) {
- parse_rgkn_block(creg, offset, offset+0x1000);
- }
-#endif
-
- creg->rgdb_keys = talloc_array(parent_ctx, RGDB_KEY **, creg->creg_hdr->num_rgdb);
-
- offset = 0;
- DEBUG(3, ("Reading %d rgdb entries\n", creg->creg_hdr->num_rgdb));
- for(i = 0; i < creg->creg_hdr->num_rgdb; i++) {
- RGDB_HDR *rgdb_hdr = (RGDB_HDR *)LOCN_RGDB_BLOCK(creg, offset);
-
- if(strncmp((char *)&(rgdb_hdr->RGDB_ID), "RGDB", 4)) {
- DEBUG(0, ("unrecognized rgdb entry: %4d, %s\n",
- rgdb_hdr->RGDB_ID, location));
- return WERR_FOOBAR;
- } else {
- DEBUG(3, ("Valid rgdb entry, first free id: %d, max id: %d\n", rgdb_hdr->first_free_id, rgdb_hdr->max_id));
- }
-
-
- creg->rgdb_keys[i] = talloc_array(creg, RGDB_KEY *, rgdb_hdr->max_id+1);
- memset(creg->rgdb_keys[i], 0, sizeof(RGDB_KEY *) * (rgdb_hdr->max_id+1));
-
- parse_rgdb_block(creg, rgdb_hdr);
-
- offset+=rgdb_hdr->size;
- }
-
- /* First element in rgkn should be root key */
- creg_root = talloc(parent_ctx, struct creg_key_data);
- creg_root->hive = creg;
- creg_root->data = LOCN_RGKN(creg, sizeof(RGKN_HDR));
- /* FIXME: attach creg to key */
-
- *root = (struct hive_key *)creg_root;
-
- return WERR_OK;
-}
-
-static WERROR creg_get_subkey_by_index (TALLOC_CTX *mem_ctx,
- const struct hive_key *parent, uint32_t n, const char **name,
- const char **classname,
- NTTIME *last_mod_time)
-{
- const struct creg_key_data *private_data =
- (const struct creg_key_data *)parent;
- CREG *creg = private_data->hive;
- RGKN_KEY *rgkn_key = private_data->data;
- RGKN_KEY *child;
- DWORD child_offset;
- DWORD cur = 0;
-
- /* Get id of first child */
- child_offset = rgkn_key->first_child_offset;
-
- while(child_offset != 0xFFFFFFFF) {
- child = LOCN_RGKN(creg, child_offset);
-
- /* n == cur ? return! */
- if(cur == n) {
- RGDB_KEY *rgdb_key;
- rgdb_key = LOCN_RGDB_KEY(creg, child->id.rgdb, child->id.id);
- if(!rgdb_key) {
- DEBUG(0, ("Can't find %d,%d in RGDB table!\n", child->id.rgdb, child->id.id));
- return WERR_FOOBAR;
- }
-
- *name = talloc_strndup(mem_ctx, (char *)rgdb_key + sizeof(RGDB_KEY), rgdb_key->name_len);
- *classname = NULL; /* Not applicable for creg */
- *last_mod_time = 0; /* Not applicable */
-
- return WERR_OK;
- }
-
- cur++;
-
- child_offset = child->next_offset;
- }
-
- return WERR_NO_MORE_ITEMS;
-}
-
-static WERROR creg_get_info(TALLOC_CTX *mem_ctx,
- const struct hive_key *k, const char **classname,
- uint32_t *subkey_count, uint32_t *value_count)
-{
- const struct creg_key_data *creg_key = (const struct creg_key_data *)k;
- RGKN_KEY *rgkn_key = creg_key->data;
- RGDB_KEY *rgdb_key = LOCN_RGDB_KEY(creg_key->hive, rgkn_key->id.rgdb, rgkn_key->id.id);
-
- if (rgdb_key == NULL)
- return WERR_FOOBAR;
-
- *subkey_count = -1; /* FIXME */
- *classname = NULL; /* Not applicable for creg */
- *value_count = rgdb_key->num_values;
-
- return WERR_OK;
-}
-
-static WERROR creg_get_value_by_id(TALLOC_CTX *mem_ctx, const struct hive_key *k, int idx, const char **name, uint32_t *type, DATA_BLOB *data)
-{
- const struct creg_key_data *creg_key = (const struct creg_key_data *)k;
- RGKN_KEY *rgkn_key = creg_key->data;
- DWORD i;
- DWORD offset = 0;
- RGDB_KEY *rgdb_key = LOCN_RGDB_KEY(creg_key->hive, rgkn_key->id.rgdb, rgkn_key->id.id);
- RGDB_VALUE *curval = NULL;
-
- if (rgdb_key == NULL)
- return WERR_FOOBAR;
-
- if (idx >= rgdb_key->num_values)
- return WERR_NO_MORE_ITEMS;
-
- for(i = 0; i < idx; i++) {
- curval = (RGDB_VALUE *)(((char *)rgdb_key) + sizeof(RGDB_KEY) + rgdb_key->name_len + offset);
- offset += sizeof(RGDB_VALUE) + curval->name_len + curval->data_len;
- }
-
- *name = talloc_strndup(mem_ctx, (char *)curval+sizeof(RGDB_VALUE), curval->name_len);
-
- *data = data_blob_talloc(mem_ctx, curval+sizeof(RGDB_VALUE)+curval->name_len, curval->data_len);
- *type = curval->type;
-
- return WERR_OK;
-}
-
-static struct hive_operations reg_backend_creg = {
- .name = "creg",
- .enum_value = creg_get_value_by_id,
- .get_key_info = creg_get_info,
- .enum_key = creg_get_subkey_by_index
-};
=== modified file 'source/lib/registry/README'
--- a/source/lib/registry/README 2007-06-02 14:03:25 +0000
+++ b/source/lib/registry/README 2007-06-12 23:46:37 +0000
@@ -14,7 +14,6 @@
The following hive backends are supported:
- ldb
- - creg (USER.DAT-style files)
- regf (NTUSER.DAT-style files)
- rpc (Remote individual hives)
- directory
=== modified file 'source/lib/registry/config.mk'
--- a/source/lib/registry/config.mk 2007-06-02 14:03:25 +0000
+++ b/source/lib/registry/config.mk 2007-06-12 23:46:37 +0000
@@ -30,7 +30,6 @@
regf.o \
hive.o \
local.o \
- creg.o \
ldb.o \
dir.o \
rpc.o
=== modified file 'source/lib/registry/hive.c'
--- a/source/lib/registry/hive.c 2007-06-12 20:08:26 +0000
+++ b/source/lib/registry/hive.c 2007-06-12 23:46:37 +0000
@@ -47,10 +47,7 @@
return WERR_BADFILE;
}
- if (!strncmp(peek, "CREG", 4)) {
- close(fd);
- return reg_open_creg_file(parent_ctx, location, root);
- } else if (!strncmp(peek, "REGF", 4)) {
+ if (!strncmp(peek, "REGF", 4)) {
close(fd);
return reg_open_regf_file(parent_ctx, location, root);
} else if (!strncmp(peek, "TDB file", 8)) {
=== modified file 'source/lib/registry/hive.h'
--- a/source/lib/registry/hive.h 2007-06-12 23:11:37 +0000
+++ b/source/lib/registry/hive.h 2007-06-12 23:46:37 +0000
@@ -155,8 +155,6 @@
/* Individual backends */
WERROR reg_open_directory(TALLOC_CTX *parent_ctx,
const char *location, struct hive_key **key);
-WERROR reg_open_creg_file(TALLOC_CTX *parent_ctx, const char *location,
- struct hive_key **root);
WERROR reg_open_regf_file(TALLOC_CTX *parent_ctx,
const char *location, struct hive_key **key);
WERROR reg_open_ldb_file(TALLOC_CTX *parent_ctx, const char *location,
More information about the samba-cvs
mailing list