diff options
| -rw-r--r-- | source3/rpc_client/cli_pipe.c | 2 | ||||
| -rw-r--r-- | source3/rpc_parse/parse_samr.c | 2 | ||||
| -rw-r--r-- | source3/smbd/chgpasswd.c | 2 | ||||
| -rw-r--r-- | source3/smbd/ipc.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c index 12e2cc243c..002c86cafc 100644 --- a/source3/rpc_client/cli_pipe.c +++ b/source3/rpc_client/cli_pipe.c @@ -104,7 +104,7 @@ static BOOL rpc_read(struct cli_state *cli, DEBUG(5,("rpc_read: offset end: 0x%x. data left to read:0x%x\n", rdata->data->offset.end, data_to_read)); - return data_to_read >= 0; + return rdata->data.data != NULL; } /**************************************************************************** diff --git a/source3/rpc_parse/parse_samr.c b/source3/rpc_parse/parse_samr.c index 5797fab31f..3fab30bf8b 100644 --- a/source3/rpc_parse/parse_samr.c +++ b/source3/rpc_parse/parse_samr.c @@ -2734,7 +2734,7 @@ void make_samr_q_chgpasswd_user(SAMR_Q_CHGPASSWD_USER *q_u, make_enc_passwd(&(q_u->lm_newpass), lm_newpass); make_enc_hash (&(q_u->lm_oldhash), lm_oldhash); -}; +} /******************************************************************* reads or writes a structure. diff --git a/source3/smbd/chgpasswd.c b/source3/smbd/chgpasswd.c index 45497e4cf8..91062268f9 100644 --- a/source3/smbd/chgpasswd.c +++ b/source3/smbd/chgpasswd.c @@ -613,7 +613,7 @@ BOOL check_oem_password(char *user, uchar unenc_old_pw[16]; uchar null_pw[16]; uchar null_ntpw[16]; - uchar no_pw[2]; + char no_pw[2]; BOOL nt_pass_set = (ntdata != NULL && nthash != NULL); become_root(False); diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c index 249c286ec7..4e4eeb40ca 100644 --- a/source3/smbd/ipc.c +++ b/source3/smbd/ipc.c @@ -1732,7 +1732,7 @@ static BOOL api_SamOEMChangePassword(connection_struct *conn,uint16 vuid, char * */ (void)Get_Pwnam( user, True); - if (pass_oem_change(user, (uchar*) data, &data[516], NULL, NULL)) + if (pass_oem_change(user, (uchar*) data, (uchar*)(&data[516]), NULL, NULL)) { SSVAL(*rparam,0,NERR_Success); } |