summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/utils/net_rpc_printer.c19
-rw-r--r--source3/winbindd/winbindd_pam.c4
2 files changed, 14 insertions, 9 deletions
diff --git a/source3/utils/net_rpc_printer.c b/source3/utils/net_rpc_printer.c
index eec5a6cacc..ef84d9eec0 100644
--- a/source3/utils/net_rpc_printer.c
+++ b/source3/utils/net_rpc_printer.c
@@ -1309,7 +1309,7 @@ static NTSTATUS rpc_printer_publish_internals_args(struct rpc_pipe_client *pipe_
struct spoolss_SetPrinterInfoCtr info_ctr;
struct spoolss_DevmodeContainer devmode_ctr;
struct sec_desc_buf secdesc_ctr;
- struct policy_handle hnd;
+ struct policy_handle hnd = { 0, };
WERROR result;
const char *action_str;
@@ -1465,7 +1465,7 @@ NTSTATUS rpc_printer_publish_list_internals(struct net_context *c,
const char *printername, *sharename;
union spoolss_PrinterInfo *info_enum;
union spoolss_PrinterInfo info;
- struct policy_handle hnd;
+ struct policy_handle hnd = { 0, };
int state;
WERROR werr;
@@ -1564,7 +1564,8 @@ NTSTATUS rpc_printer_migrate_security_internals(struct net_context *c,
const char *printername, *sharename;
struct rpc_pipe_client *pipe_hnd_dst = NULL;
struct dcerpc_binding_handle *b_dst = NULL;
- struct policy_handle hnd_src, hnd_dst;
+ struct policy_handle hnd_src = { 0, };
+ struct policy_handle hnd_dst = { 0, };
union spoolss_PrinterInfo *info_enum;
struct cli_state *cli_dst = NULL;
union spoolss_PrinterInfo info_src, info_dst;
@@ -1714,7 +1715,8 @@ NTSTATUS rpc_printer_migrate_forms_internals(struct net_context *c,
const char *printername, *sharename;
struct rpc_pipe_client *pipe_hnd_dst = NULL;
struct dcerpc_binding_handle *b_dst = NULL;
- struct policy_handle hnd_src, hnd_dst;
+ struct policy_handle hnd_src = { 0, };
+ struct policy_handle hnd_dst = { 0, };
union spoolss_PrinterInfo *info_enum;
union spoolss_PrinterInfo info_dst;
uint32_t num_forms;
@@ -1889,7 +1891,8 @@ NTSTATUS rpc_printer_migrate_drivers_internals(struct net_context *c,
bool got_dst_driver_share = false;
struct rpc_pipe_client *pipe_hnd_dst = NULL;
struct dcerpc_binding_handle *b_dst = NULL;
- struct policy_handle hnd_src, hnd_dst;
+ struct policy_handle hnd_src = { 0, };
+ struct policy_handle hnd_dst = { 0, };
union spoolss_DriverInfo drv_info_src;
union spoolss_PrinterInfo *info_enum;
union spoolss_PrinterInfo info_dst;
@@ -2110,7 +2113,8 @@ NTSTATUS rpc_printer_migrate_printers_internals(struct net_context *c,
union spoolss_PrinterInfo info_dst, info_src;
union spoolss_PrinterInfo *info_enum;
struct cli_state *cli_dst = NULL;
- struct policy_handle hnd_dst, hnd_src;
+ struct policy_handle hnd_src = { 0, };
+ struct policy_handle hnd_dst = { 0, };
const char *printername, *sharename;
struct rpc_pipe_client *pipe_hnd_dst = NULL;
struct dcerpc_binding_handle *b_dst = NULL;
@@ -2279,7 +2283,8 @@ NTSTATUS rpc_printer_migrate_settings_internals(struct net_context *c,
const char *printername, *sharename;
struct rpc_pipe_client *pipe_hnd_dst = NULL;
struct dcerpc_binding_handle *b_dst = NULL;
- struct policy_handle hnd_src, hnd_dst;
+ struct policy_handle hnd_src = { 0, };
+ struct policy_handle hnd_dst = { 0, };
union spoolss_PrinterInfo *info_enum;
union spoolss_PrinterInfo info_dst_publish;
union spoolss_PrinterInfo info_dst;
diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
index 6757f3611e..216e1ffc33 100644
--- a/source3/winbindd/winbindd_pam.c
+++ b/source3/winbindd/winbindd_pam.c
@@ -2213,8 +2213,8 @@ enum winbindd_result winbindd_dual_pam_chng_pswd_auth_crap(struct winbindd_domai
state->request->data.chng_pswd_auth_crap.old_lm_hash_enc,
state->request->data.chng_pswd_auth_crap.old_lm_hash_enc_len);
} else {
- new_lm_password.length = 0;
- old_lm_hash_enc.length = 0;
+ new_lm_password = data_blob_null;
+ old_lm_hash_enc = data_blob_null;
}
/* Get sam handle */