sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

s3: use pull_reg_multi_sz in rpcclient and net.

Browse Source 
Guenther
This commit is contained in:
Günther Deschner 2009-09-29 23:22:46 +02:00
parent fc1c243348
commit b0a66496f5
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source3/rpcclient/cmd_spoolss.c
View File

@ -723,18 +723,17 @@ static void display_reg_value(struct regval_blob value)
break;
}
case REG_MULTI_SZ: {
uint32_t i, num_values;
char **values;
uint32_t i;
const char **values;
DATA_BLOB blob = data_blob_const(value.data_p, value.size);
if (!W_ERROR_IS_OK(reg_pull_multi_sz(NULL, value.data_p,
value.size, &num_values,
&values))) {
d_printf("reg_pull_multi_sz failed\n");
if (!pull_reg_multi_sz(NULL, &blob, &values)) {
d_printf("pull_reg_multi_sz failed\n");
break;
}
printf("%s: REG_MULTI_SZ: \n", value.valuename);
for (i=0; i<num_values; i++) {
for (i=0; values[i] != NULL; i++) {
d_printf("%s\n", values[i]);
}
TALLOC_FREE(values);

14
source3/utils/net_rpc_printer.c
View File

@ -100,17 +100,17 @@ static void display_reg_value(const char *subkey, struct regval_blob value)
break;
case REG_MULTI_SZ: {
uint32_t i, num_values;
char **values;
uint32_t i;
const char **values;
DATA_BLOB blob = data_blob_const(value.data_p, value.size);
if (!W_ERROR_IS_OK(reg_pull_multi_sz(NULL, value.data_p,
value.size, &num_values,
&values))) {
d_printf(_("reg_pull_multi_sz failed\n"));
if (!pull_reg_multi_sz(NULL, &blob, &values)) {
d_printf("pull_reg_multi_sz failed\n");
break;
}
for (i=0; i<num_values; i++) {
printf("%s: REG_MULTI_SZ: \n", value.valuename);
for (i=0; values[i] != NULL; i++) {
d_printf("%s\n", values[i]);
}
TALLOC_FREE(values);