[SCM] Samba Shared Repository - branch v3-2-test updated -
release-3-2-0pre2-526-g3250068
Michael Adam
obnox at samba.org
Fri Mar 28 15:20:38 GMT 2008
The branch, v3-2-test has been updated
via 3250068eb980bd0489f814f702401cdc9c925a8d (commit)
from 8dd6458049d1b9d6849730ac19c39b049a68f302 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test
- Log -----------------------------------------------------------------
commit 3250068eb980bd0489f814f702401cdc9c925a8d
Author: Michael Adam <obnox at samba.org>
Date: Fri Mar 28 01:21:49 2008 +0100
net: add a "net registry" subcommand to locally access the registry.
The interface is like that of net rpc registry.
Access is direct local access to the registry tdb through reg_api.
Michael
-----------------------------------------------------------------------
Summary of changes:
source/Makefile.in | 4 +-
source/utils/net.c | 1 +
source/utils/net_registry.c | 530 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 534 insertions(+), 1 deletions(-)
create mode 100644 source/utils/net_registry.c
Changeset truncated at 500 lines:
diff --git a/source/Makefile.in b/source/Makefile.in
index c6e3af0..d586082 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -841,7 +841,9 @@ NET_OBJ1 = utils/net.o utils/net_ads.o utils/net_help.o \
utils/netlookup.o utils/net_sam.o utils/net_rpc_shell.o \
utils/net_util.o utils/net_rpc_sh_acct.o utils/net_rpc_audit.o \
$(PASSWD_UTIL_OBJ) utils/net_dns.o utils/net_ads_gpo.o \
- utils/net_conf.o auth/token_util.o utils/net_dom.o nsswitch/wb_client.o
+ utils/net_conf.o \
+ utils/net_registry.o \
+ auth/token_util.o utils/net_dom.o nsswitch/wb_client.o
NET_OBJ = $(NET_OBJ1) $(PARAM_WITHOUT_REG_OBJ) $(SECRETS_OBJ) $(LIBSMB_OBJ) \
$(RPC_PARSE_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
diff --git a/source/utils/net.c b/source/utils/net.c
index 1b21c5e..5706e33 100644
--- a/source/utils/net.c
+++ b/source/utils/net.c
@@ -1001,6 +1001,7 @@ static struct functable net_func[] = {
{"USERSHARE", net_usershare},
{"USERSIDLIST", net_usersidlist},
{"CONF", net_conf},
+ {"REGISTRY", net_registry},
#ifdef WITH_FAKE_KASERVER
{"AFS", net_afs},
#endif
diff --git a/source/utils/net_registry.c b/source/utils/net_registry.c
new file mode 100644
index 0000000..dfa3555
--- /dev/null
+++ b/source/utils/net_registry.c
@@ -0,0 +1,530 @@
+/*
+ * Samba Unix/Linux SMB client library
+ * Distributed SMB/CIFS Server Management Utility
+ * Local registry interface
+ *
+ * Copyright (C) Michael Adam 2008
+ *
+ * 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/>.
+ */
+
+#include "includes.h"
+#include "utils/net.h"
+
+
+/*
+ *
+ * Helper functions
+ *
+ */
+
+static void print_registry_key(const char *keyname, NTTIME *modtime)
+{
+ d_printf("Keyname = %s\n", keyname);
+ d_printf("Modtime = %s\n",
+ modtime
+ ? http_timestring(nt_time_to_unix(*modtime))
+ : "None");
+ d_printf("\n");
+}
+
+static void print_registry_value(const char *valname,
+ const struct registry_value *valvalue)
+{
+ d_printf("Valuename = %s\n", valname);
+ d_printf("Type = %s\n",
+ reg_type_lookup(valvalue->type));
+ switch(valvalue->type) {
+ case REG_DWORD:
+ d_printf("Value = %d\n", valvalue->v.dword);
+ break;
+ case REG_SZ:
+ case REG_EXPAND_SZ:
+ d_printf("Value = \"%s\"\n", valvalue->v.sz.str);
+ break;
+ case REG_MULTI_SZ: {
+ uint32 j;
+ for (j = 0; j < valvalue->v.multi_sz.num_strings; j++) {
+ d_printf("Value[%3.3d] = \"%s\"\n", j,
+ valvalue->v.multi_sz.strings[j]);
+ }
+ break;
+ }
+ case REG_BINARY:
+ d_printf("Value = %d bytes\n",
+ (int)valvalue->v.binary.length);
+ break;
+ default:
+ d_printf("Value = <unprintable>\n");
+ break;
+ }
+ d_printf("\n");
+}
+
+/**
+ * Split path into hive name and subkeyname
+ * normalizations performed:
+ * - convert '/' to '\\'
+ * - strip trailing '\\' chars
+ */
+static WERROR split_hive_key(TALLOC_CTX *ctx, const char *path,
+ char **hivename, const char **subkeyname)
+{
+ char *p;
+
+ if ((path == NULL) || (hivename == NULL) || (subkeyname == NULL)) {
+ return WERR_INVALID_PARAM;
+ }
+
+ if (strlen(path) == 0) {
+ return WERR_INVALID_PARAM;
+ }
+
+ *hivename = talloc_string_sub(ctx, path, "/", "\\");
+ if (*hivename == NULL) {
+ return WERR_NOMEM;
+ }
+
+ /* strip trailing '\\' chars */
+ p = strrchr(*hivename, '\\');
+ while ((p != NULL) && (p[1] == '\0')) {
+ *p = '\0';
+ p = strrchr(*hivename, '\\');
+ }
+
+ p = strchr(*hivename, '\\');
+
+ if ((p == NULL) || (*p == '\0')) {
+ /* just the hive - no subkey given */
+ *subkeyname = "";
+ } else {
+ *p = '\0';
+ *subkeyname = p+1;
+ }
+
+ return WERR_OK;
+}
+
+/**
+ * split given path into hive and remaining path and open the hive key
+ */
+static WERROR open_hive(TALLOC_CTX *ctx, const char *path,
+ uint32 desired_access,
+ struct registry_key **hive,
+ char **subkeyname)
+{
+ WERROR werr;
+ NT_USER_TOKEN *token = NULL;
+ char *hivename = NULL;
+ const char *tmp_subkeyname = NULL;
+ TALLOC_CTX *tmp_ctx = talloc_stackframe();
+
+ if ((hive == NULL) || (subkeyname == NULL)) {
+ werr = WERR_INVALID_PARAM;
+ goto done;
+ }
+
+ werr = split_hive_key(tmp_ctx, path, &hivename, &tmp_subkeyname);
+ if (!W_ERROR_IS_OK(werr)) {
+ goto done;
+ }
+ *subkeyname = talloc_strdup(ctx, tmp_subkeyname);
+ if (*subkeyname == NULL) {
+ werr = WERR_NOMEM;
+ goto done;
+ }
+
+ werr = ntstatus_to_werror(registry_create_admin_token(tmp_ctx, &token));
+ if (!W_ERROR_IS_OK(werr)) {
+ goto done;
+ }
+
+ werr = reg_openhive(ctx, hivename, desired_access, token, hive);
+ if (!W_ERROR_IS_OK(werr)) {
+ goto done;
+ }
+
+ werr = WERR_OK;
+
+done:
+ TALLOC_FREE(tmp_ctx);
+ return werr;
+}
+
+static WERROR open_key(TALLOC_CTX *ctx, const char *path,
+ uint32 desired_access,
+ struct registry_key **key)
+{
+ WERROR werr;
+ char *subkey_name = NULL;
+ struct registry_key *hive = NULL;
+ TALLOC_CTX *tmp_ctx = talloc_stackframe();
+
+ if ((path == NULL) || (key == NULL)) {
+ return WERR_INVALID_PARAM;
+ }
+
+ werr = open_hive(tmp_ctx, path, desired_access, &hive, &subkey_name);
+ if (!W_ERROR_IS_OK(werr)) {
+ d_fprintf(stderr, "open_hive failed: %s\n", dos_errstr(werr));
+ goto done;
+ }
+
+ werr = reg_openkey(ctx, hive, subkey_name, desired_access, key);
+ if (!W_ERROR_IS_OK(werr)) {
+ d_fprintf(stderr, "reg_openkey failed: %s\n",
+ dos_errstr(werr));
+ goto done;
+ }
+
+ werr = WERR_OK;
+
+done:
+ TALLOC_FREE(tmp_ctx);
+ return werr;
+}
+
+/*
+ *
+ * the main "net registry" function implementations
+ *
+ */
+
+static int net_registry_enumerate(int argc, const char **argv)
+{
+ WERROR werr;
+ struct registry_key *key = NULL;
+ TALLOC_CTX *ctx = talloc_stackframe();
+ char *subkey_name;
+ NTTIME *modtime;
+ uint32_t count;
+ char *valname = NULL;
+ struct registry_value *valvalue = NULL;
+ int ret = -1;
+
+ if (argc != 1) {
+ d_printf("Usage: net registry enumerate <path>\n");
+ d_printf("Example: net registry enumerate "
+ "'HKLM\\Software\\Samba'\n");
+ goto done;
+ }
+
+ werr = open_key(ctx, argv[0], REG_KEY_READ, &key);
+ if (!W_ERROR_IS_OK(werr)) {
+ d_fprintf(stderr, "open_key failed: %s\n", dos_errstr(werr));
+ goto done;
+ }
+
+ for (count = 0;
+ werr = reg_enumkey(ctx, key, count, &subkey_name, modtime),
+ W_ERROR_IS_OK(werr);
+ count++)
+ {
+ print_registry_key(subkey_name, modtime);
+ }
+ if (!W_ERROR_EQUAL(WERR_NO_MORE_ITEMS, werr)) {
+ goto done;
+ }
+
+ for (count = 0;
+ werr = reg_enumvalue(ctx, key, count, &valname, &valvalue),
+ W_ERROR_IS_OK(werr);
+ count++)
+ {
+ print_registry_value(valname, valvalue);
+ }
+ if (!W_ERROR_EQUAL(WERR_NO_MORE_ITEMS, werr)) {
+ goto done;
+ }
+
+ ret = 0;
+done:
+ TALLOC_FREE(ctx);
+ return ret;
+}
+
+static int net_registry_createkey(int argc, const char **argv)
+{
+ WERROR werr;
+ enum winreg_CreateAction action;
+ char *subkeyname;
+ struct registry_key *hivekey = NULL;
+ struct registry_key *subkey = NULL;
+ TALLOC_CTX *ctx = talloc_stackframe();
+ int ret = -1;
+
+ if (argc != 1) {
+ d_printf("Usage: net registry createkey <path>\n");
+ d_printf("Example: net registry createkey "
+ "'HKLM\\Software\\Samba\\smbconf.127.0.0.1'\n");
+ goto done;
+ }
+ if (strlen(argv[0]) == 0) {
+ d_fprintf(stderr, "error: zero length key name given\n");
+ goto done;
+ }
+
+ werr = open_hive(ctx, argv[0], REG_KEY_WRITE, &hivekey, &subkeyname);
+ if (!W_ERROR_IS_OK(werr)) {
+ d_fprintf(stderr, "open_hive failed: %s\n", dos_errstr(werr));
+ goto done;
+ }
+
+ werr = reg_createkey(ctx, hivekey, subkeyname, REG_KEY_WRITE,
+ &subkey, &action);
+ if (!W_ERROR_IS_OK(werr)) {
+ d_fprintf(stderr, "reg_createkey failed: %s\n",
+ dos_errstr(werr));
+ goto done;
+ }
+ switch (action) {
+ case REG_ACTION_NONE:
+ d_printf("createkey did nothing -- huh?\n");
+ break;
+ case REG_CREATED_NEW_KEY:
+ d_printf("createkey created %s\n", argv[0]);
+ break;
+ case REG_OPENED_EXISTING_KEY:
+ d_printf("createkey opened existing %s\n", argv[0]);
+ break;
+ }
+
+ ret = 0;
+
+done:
+ TALLOC_FREE(ctx);
+ return ret;
+}
+
+static int net_registry_deletekey(int argc, const char **argv)
+{
+ WERROR werr;
+ char *subkeyname;
+ struct registry_key *hivekey = NULL;
+ TALLOC_CTX *ctx = talloc_stackframe();
+ int ret = -1;
+
+ if (argc != 1) {
+ d_printf("Usage: net registry deletekey <path>\n");
+ d_printf("Example: net registry deletekey "
+ "'HKLM\\Software\\Samba\\smbconf.127.0.0.1'\n");
+ goto done;
+ }
+ if (strlen(argv[0]) == 0) {
+ d_fprintf(stderr, "error: zero length key name given\n");
+ goto done;
+ }
+
+ werr = open_hive(ctx, argv[0], REG_KEY_WRITE, &hivekey, &subkeyname);
+ if (!W_ERROR_IS_OK(werr)) {
+ d_fprintf(stderr, "open_hive failed: %s\n", dos_errstr(werr));
+ goto done;
+ }
+
+ werr = reg_deletekey(hivekey, subkeyname);
+ if (!W_ERROR_IS_OK(werr)) {
+ d_fprintf(stderr, "reg_deletekey failed: %s\n",
+ dos_errstr(werr));
+ goto done;
+ }
+
+ ret = 0;
+
+done:
+ TALLOC_FREE(ctx);
+ return ret;
+}
+
+static int net_registry_setvalue(int argc, const char **argv)
+{
+ WERROR werr;
+ struct registry_value value;
+ struct registry_key *key = NULL;
+ int ret = -1;
+ TALLOC_CTX *ctx = talloc_stackframe();
+
+ if (argc < 4) {
+ d_fprintf(stderr, "usage: net rpc registry setvalue <key> "
+ "<valuename> <type> [<val>]+\n");
+ goto done;
+ }
+
+ if (!strequal(argv[2], "multi_sz") && (argc != 4)) {
+ d_fprintf(stderr, "Too many args for type %s\n", argv[2]);
+ goto done;
+ }
+
+ if (strequal(argv[2], "dword")) {
+ value.type = REG_DWORD;
+ value.v.dword = strtoul(argv[3], NULL, 10);
+ } else if (strequal(argv[2], "sz")) {
+ value.type = REG_SZ;
+ value.v.sz.len = strlen(argv[3])+1;
+ value.v.sz.str = CONST_DISCARD(char *, argv[3]);
+ } else {
+ d_fprintf(stderr, "type \"%s\" not implemented\n", argv[2]);
+ goto done;
+ }
+
+ werr = open_key(ctx, argv[0], REG_KEY_WRITE, &key);
+ if (!W_ERROR_IS_OK(werr)) {
+ d_fprintf(stderr, "open_key failed: %s\n", dos_errstr(werr));
+ goto done;
+ }
+
+ werr = reg_setvalue(key, argv[1], &value);
+ if (!W_ERROR_IS_OK(werr)) {
+ d_fprintf(stderr, "reg_setvalue failed: %s\n",
+ dos_errstr(werr));
+ goto done;
+ }
+
+ ret = 0;
+
+done:
+ TALLOC_FREE(ctx);
+ return ret;
+}
+
+static int net_registry_deletevalue(int argc, const char **argv)
+{
+ WERROR werr;
+ struct registry_key *key = NULL;
+ TALLOC_CTX *ctx = talloc_stackframe();
+ int ret = -1;
+
+ if (argc != 2) {
+ d_fprintf(stderr, "usage: net rpc registry deletevalue <key> "
+ "<valuename>\n");
+ goto done;
+ }
+
+ werr = open_key(ctx, argv[0], REG_KEY_WRITE, &key);
+ if (!W_ERROR_IS_OK(werr)) {
+ d_fprintf(stderr, "open_key failed: %s\n", dos_errstr(werr));
+ goto done;
+ }
+
+ werr = reg_deletevalue(key, argv[1]);
+ if (!W_ERROR_IS_OK(werr)) {
+ d_fprintf(stderr, "reg_deletekey failed: %s\n",
+ dos_errstr(werr));
+ goto done;
+ }
+
+ ret = 0;
+
+done:
+ TALLOC_FREE(ctx);
+ return ret;
+}
+
+static int net_registry_getsd(int argc, const char **argv)
+{
+ WERROR werr;
+ int ret = -1;
+ struct registry_key *key = NULL;
+ struct security_descriptor *secdesc = NULL;
+ TALLOC_CTX *ctx = talloc_stackframe();
+ uint32_t access_mask = REG_KEY_READ |
+ SEC_RIGHT_MAXIMUM_ALLOWED |
+ SEC_RIGHT_SYSTEM_SECURITY;
+
+ /*
+ * net_rpc_regsitry uses SEC_RIGHT_SYSTEM_SECURITY, but access
+ * is denied with these perms right now...
+ */
+ access_mask = REG_KEY_READ;
+
+ if (argc != 1) {
+ d_printf("Usage: net registry getsd <path>\n");
+ d_printf("Example: net registry getsd "
+ "'HKLM\\Software\\Samba'\n");
+ goto done;
+ }
+ if (strlen(argv[0]) == 0) {
+ d_fprintf(stderr, "error: zero length key name given\n");
+ goto done;
+ }
+
+ werr = open_key(ctx, argv[0], access_mask, &key);
+ if (!W_ERROR_IS_OK(werr)) {
+ d_fprintf(stderr, "open_key failed: %s\n", dos_errstr(werr));
+ goto done;
+ }
+
+ werr = reg_getkeysecurity(ctx, key, &secdesc);
--
Samba Shared Repository
More information about the samba-cvs
mailing list