sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-29 13:49:30 +03:00
Code Activity

r19827: Move registry_push/pull_value to lib/util_reg.c

Browse Source 
(This used to be commit 3047a4b92c)
This commit is contained in:
Volker Lendecke
2006-11-21 21:18:53 +00:00
committed by Gerald (Jerry) Carter
parent 807c50858f
commit 334c868b83
2 changed files with 116 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

117
source3/lib/util_reg.c
View File

@ -20,7 +20,7 @@
#include "includes.h"
const char *reg_type_lookup(uint32 type)
const char *reg_type_lookup(enum winreg_Type type)
{
const char *result;
@ -108,3 +108,118 @@ NTSTATUS reg_pull_multi_sz(TALLOC_CTX *mem_ctx, const void *buf, size_t len,
return NT_STATUS_OK;
}
NTSTATUS registry_pull_value(TALLOC_CTX *mem_ctx,
struct registry_value **pvalue,
enum winreg_Type type, uint8 *data,
uint32 size, uint32 length)
{
struct registry_value *value;
NTSTATUS status;
if (!(value = TALLOC_ZERO_P(mem_ctx, struct registry_value))) {
return NT_STATUS_NO_MEMORY;
}
value->type = type;
switch (type) {
case REG_DWORD:
if ((size != 4) || (length != 4)) {
status = NT_STATUS_INVALID_PARAMETER;
goto error;
}
value->v.dword = IVAL(data, 0);
break;
case REG_SZ:
case REG_EXPAND_SZ:
{
/*
* Make sure we get a NULL terminated string for
* convert_string_talloc().
*/
smb_ucs2_t *tmp;
uint32 num_ucs2 = length / 2;
if ((length % 2) != 0) {
status = NT_STATUS_INVALID_PARAMETER;
goto error;
}
if (!(tmp = SMB_MALLOC_ARRAY(smb_ucs2_t, num_ucs2+1))) {
status = NT_STATUS_NO_MEMORY;
goto error;
}
memcpy((void *)tmp, (const void *)data, length);
tmp[num_ucs2] = 0;
value->v.sz.len = convert_string_talloc(
value, CH_UTF16LE, CH_UNIX, tmp, length+2,
&value->v.sz.str, False);
SAFE_FREE(tmp);
if (value->v.sz.len == (size_t)-1) {
status = NT_STATUS_INVALID_PARAMETER;
goto error;
}
break;
}
case REG_MULTI_SZ:
status = reg_pull_multi_sz(value, (void *)data, length,
&value->v.multi_sz.num_strings,
&value->v.multi_sz.strings);
if (!(NT_STATUS_IS_OK(status))) {
goto error;
}
break;
case REG_BINARY:
value->v.binary.data = talloc_move(value, &data);
value->v.binary.length = length;
break;
default:
status = NT_STATUS_INVALID_PARAMETER;
goto error;
}
*pvalue = value;
return NT_STATUS_OK;
error:
TALLOC_FREE(value);
return status;
}
NTSTATUS registry_push_value(TALLOC_CTX *mem_ctx,
const struct registry_value *value,
DATA_BLOB *presult)
{
switch (value->type) {
case REG_DWORD: {
char buf[4];
SIVAL(buf, 0, value->v.dword);
*presult = data_blob_talloc(mem_ctx, (void *)buf, 4);
if (presult->data == NULL) {
return NT_STATUS_NO_MEMORY;
}
break;
}
case REG_SZ:
case REG_EXPAND_SZ: {
presult->length = convert_string_talloc(
mem_ctx, CH_UNIX, CH_UTF16LE, value->v.sz.str,
MIN(value->v.sz.len, strlen(value->v.sz.str)+1),
(void *)&(presult->data), False);
if (presult->length == (size_t)-1) {
return NT_STATUS_NO_MEMORY;
}
break;
}
default:
return NT_STATUS_INVALID_PARAMETER;
}
return NT_STATUS_OK;
}

115
source3/utils/net_rpc_registry.c
View File

@ -208,121 +208,6 @@ static NTSTATUS registry_enumkeys(TALLOC_CTX *ctx,
return status;
}
static NTSTATUS registry_pull_value(TALLOC_CTX *mem_ctx,
struct registry_value **pvalue,
enum winreg_Type type, uint8 *data,
uint32 size, uint32 length)
{
struct registry_value *value;
NTSTATUS status;
if (!(value = TALLOC_ZERO_P(mem_ctx, struct registry_value))) {
return NT_STATUS_NO_MEMORY;
}
value->type = type;
switch (type) {
case REG_DWORD:
if ((size != 4) || (length != 4)) {
status = NT_STATUS_INVALID_PARAMETER;
goto error;
}
value->v.dword = IVAL(data, 0);
break;
case REG_SZ:
case REG_EXPAND_SZ:
{
/*
* Make sure we get a NULL terminated string for
* convert_string_talloc().
*/
smb_ucs2_t *tmp;
uint32 num_ucs2 = length / 2;
if ((length % 2) != 0) {
status = NT_STATUS_INVALID_PARAMETER;
goto error;
}
if (!(tmp = SMB_MALLOC_ARRAY(smb_ucs2_t, num_ucs2+1))) {
status = NT_STATUS_NO_MEMORY;
goto error;
}
memcpy((void *)tmp, (const void *)data, length);
tmp[num_ucs2] = 0;
value->v.sz.len = convert_string_talloc(
value, CH_UTF16LE, CH_UNIX, tmp, length+2,
&value->v.sz.str, False);
SAFE_FREE(tmp);
if (value->v.sz.len == (size_t)-1) {
status = NT_STATUS_INVALID_PARAMETER;
goto error;
}
break;
}
case REG_MULTI_SZ:
status = reg_pull_multi_sz(value, (void *)data, length,
&value->v.multi_sz.num_strings,
&value->v.multi_sz.strings);
if (!(NT_STATUS_IS_OK(status))) {
goto error;
}
break;
case REG_BINARY:
value->v.binary.data = talloc_move(value, &data);
value->v.binary.length = length;
break;
default:
status = NT_STATUS_INVALID_PARAMETER;
goto error;
}
*pvalue = value;
return NT_STATUS_OK;
error:
TALLOC_FREE(value);
return status;
}
static NTSTATUS registry_push_value(TALLOC_CTX *mem_ctx,
const struct registry_value *value,
DATA_BLOB *presult)
{
switch (value->type) {
case REG_DWORD: {
char buf[4];
SIVAL(buf, 0, value->v.dword);
*presult = data_blob_talloc(mem_ctx, (void *)buf, 4);
if (presult->data == NULL) {
return NT_STATUS_NO_MEMORY;
}
break;
}
case REG_SZ:
case REG_EXPAND_SZ: {
presult->length = convert_string_talloc(
mem_ctx, CH_UNIX, CH_UTF16LE, value->v.sz.str,
MIN(value->v.sz.len, strlen(value->v.sz.str)+1),
(void *)&(presult->data), False);
if (presult->length == (size_t)-1) {
return NT_STATUS_NO_MEMORY;
}
break;
}
default:
return NT_STATUS_INVALID_PARAMETER;
}
return NT_STATUS_OK;
}
static NTSTATUS registry_enumvalues(TALLOC_CTX *ctx,
struct rpc_pipe_client *pipe_hnd,
struct policy_handle *key_hnd,