summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2010-09-21 06:51:38 +0200
committerMichael Adam <obnox@samba.org>2010-09-21 06:53:33 +0200
commit08cf13a3df212bd421275f61e2db146752490c7d (patch)
tree5133d0b839156465a37c7424f1ce8656f73c4d0a /source3
parent7f1efa6ea25eba0c0829131758746ac0c2ab9e42 (diff)
downloadsamba-08cf13a3df212bd421275f61e2db146752490c7d.tar.gz
samba-08cf13a3df212bd421275f61e2db146752490c7d.tar.bz2
samba-08cf13a3df212bd421275f61e2db146752490c7d.zip
s3:registry: remove now (finally) obsolete reg_util_registry.{c,h}
Diffstat (limited to 'source3')
-rw-r--r--source3/Makefile.in3
-rw-r--r--source3/registry/reg_util_legacy.c52
-rw-r--r--source3/registry/reg_util_legacy.h45
3 files changed, 1 insertions, 99 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index b7dfc6e13e..c72a6c30ab 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -657,8 +657,7 @@ REG_FULL_OBJ = $(REG_SMBCONF_OBJ) \
$(REG_INIT_FULL_OBJ) \
registry/reg_eventlog.o \
registry/reg_perfcount.o \
- librpc/gen_ndr/ndr_perfcount.o \
- registry/reg_util_legacy.o
+ librpc/gen_ndr/ndr_perfcount.o
LIB_EVENTLOG_OBJ = lib/eventlog/eventlog.o
diff --git a/source3/registry/reg_util_legacy.c b/source3/registry/reg_util_legacy.c
deleted file mode 100644
index 29b0889402..0000000000
--- a/source3/registry/reg_util_legacy.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Unix SMB/CIFS implementation.
- * Virtual Windows Registry Layer
- * Copyright (C) Gerald Carter 2002-2005
- *
- * 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 3 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, see <http://www.gnu.org/licenses/>.
- */
-
-/* Implementation of registry frontend view functions. */
-
-#include "includes.h"
-#include "registry.h"
-#include "reg_util_legacy.h"
-#include "reg_api_util.h"
-
-#undef DBGC_CLASS
-#define DBGC_CLASS DBGC_REGISTRY
-
-/**
- * legacy open key function that should be replaced by uses of
- * reg_open_path
- */
-WERROR regkey_open_internal(TALLOC_CTX *ctx,
- struct registry_key_handle **regkey,
- const char *path,
- const struct security_token *token,
- uint32 access_desired )
-{
- struct registry_key *key;
- WERROR err;
- TALLOC_CTX *tmp_ctx = talloc_stackframe();
-
- err = reg_open_path(tmp_ctx, path, access_desired, token, &key);
- if (!W_ERROR_IS_OK(err)) {
- return err;
- }
-
- *regkey = talloc_move(ctx, &key->key);
- TALLOC_FREE(tmp_ctx);
- return WERR_OK;
-}
diff --git a/source3/registry/reg_util_legacy.h b/source3/registry/reg_util_legacy.h
deleted file mode 100644
index d0cb626fb2..0000000000
--- a/source3/registry/reg_util_legacy.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Unix SMB/CIFS implementation.
- * Virtual Windows Registry Layer
- * Copyright (C) Gerald Carter 2002-2005
- * Copyright (C) Michael Adam 2009
- *
- * 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 3 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, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef _REG_UTIL_LEGACY_H
-#define _REG_UTIL_LEGACY_H
-
-/*
- * This module contains legacy code code from the old regkey
- * interface that is now mostly hidden behind the reg_api interface.
- * This code should be removed once the last users of the old code
- * have been converted.
- */
-
-#include "includes.h"
-#include "registry.h"
-
-/**
- * legacy open key function that should be replaced by uses of
- * reg_open_path
- */
-
-WERROR regkey_open_internal(TALLOC_CTX *ctx,
- struct registry_key_handle **regkey,
- const char *path,
- const struct security_token *token,
- uint32 access_desired );
-
-#endif /* _REG_UTIL_LEGACY_H */