From 06466de5e9636dc2934c8f52f20d71ed0f4e6da0 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Fri, 4 Apr 2008 13:21:03 +0200 Subject: net_registry: split utility function of common interest out into util module. Michael (This used to be commit 3bf890783fadd245c59280173627a6caca2dbefe) --- source3/Makefile.in | 1 + source3/utils/net_registry.c | 88 +----------------------------- source3/utils/net_registry_util.c | 110 ++++++++++++++++++++++++++++++++++++++ source3/utils/net_registry_util.h | 39 ++++++++++++++ 4 files changed, 151 insertions(+), 87 deletions(-) create mode 100644 source3/utils/net_registry_util.c create mode 100644 source3/utils/net_registry_util.h diff --git a/source3/Makefile.in b/source3/Makefile.in index 60f03e4363..6846d80c0b 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -844,6 +844,7 @@ NET_OBJ1 = utils/net.o utils/net_ads.o utils/net_help.o \ $(PASSWD_UTIL_OBJ) utils/net_dns.o utils/net_ads_gpo.o \ utils/net_conf.o \ utils/net_registry.o \ + utils/net_registry_util.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) \ diff --git a/source3/utils/net_registry.c b/source3/utils/net_registry.c index 3d24500774..f21a1603cf 100644 --- a/source3/utils/net_registry.c +++ b/source3/utils/net_registry.c @@ -21,6 +21,7 @@ #include "includes.h" #include "utils/net.h" +#include "utils/net_registry_util.h" /* @@ -29,93 +30,6 @@ * */ -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 = \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 */ diff --git a/source3/utils/net_registry_util.c b/source3/utils/net_registry_util.c new file mode 100644 index 0000000000..b1d0c7765c --- /dev/null +++ b/source3/utils/net_registry_util.c @@ -0,0 +1,110 @@ +/* + * Samba Unix/Linux SMB client library + * Distributed SMB/CIFS Server Management Utility + * registry utility functions + * + * 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 . + */ + +#include "includes.h" +#include "utils/net_registry_util.h" + +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"); +} + +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 = \n"); + break; + } + d_printf("\n"); +} + +/** + * Split path into hive name and subkeyname + * normalizations performed: + * - convert '/' to '\\' + * - strip trailing '\\' chars + */ +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; +} diff --git a/source3/utils/net_registry_util.h b/source3/utils/net_registry_util.h new file mode 100644 index 0000000000..5438f39946 --- /dev/null +++ b/source3/utils/net_registry_util.h @@ -0,0 +1,39 @@ +/* + * Samba Unix/Linux SMB client library + * Distributed SMB/CIFS Server Management Utility + * registry utility functions + * + * 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 . + */ + +#ifndef __NET_REGISTRY_UTIL_H__ +#define __NET_REGISTRY_UTIL_H__ + +void print_registry_key(const char *keyname, NTTIME *modtime); + +void print_registry_value(const char *valname, + const struct registry_value *valvalue); + +/** + * Split path into hive name and subkeyname + * normalizations performed: + * - convert '/' to '\\' + * - strip trailing '\\' chars + */ +WERROR split_hive_key(TALLOC_CTX *ctx, const char *path, char **hivename, + const char **subkeyname); + +#endif -- cgit