diff options
| -rw-r--r-- | source3/passdb/passdb.c | 2 | ||||
| -rw-r--r-- | source3/passdb/smbpass.c | 2 | ||||
| -rw-r--r-- | source3/rpc_server/srv_samr.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source3/passdb/passdb.c b/source3/passdb/passdb.c index 396781d2f0..4a86e095da 100644 --- a/source3/passdb/passdb.c +++ b/source3/passdb/passdb.c @@ -811,7 +811,7 @@ static BOOL read_sid_from_file(int fd, char *sid_file) { fstring fline; - if(read(fd, &fline, sizeof(fline) -1 ) < 0) { + if(read(fd, fline, sizeof(fline) -1 ) < 0) { DEBUG(0,("read_sid_from_file: unable to read file %s. Error was %s\n", sid_file, strerror(errno) )); return False; diff --git a/source3/passdb/smbpass.c b/source3/passdb/smbpass.c index 633a527be1..4d446c65c2 100644 --- a/source3/passdb/smbpass.c +++ b/source3/passdb/smbpass.c @@ -475,7 +475,7 @@ Error was %s\n", newpwd->smb_name, pfile, strerror(errno))); new_entry_length = strlen(newpwd->smb_name) + 1 + 15 + 1 + 32 + 1 + 32 + 1 + 5 + 1 + 13 + 2; - if((new_entry = (char *)malloc( new_entry_length )) == NULL) { + if((new_entry = (unsigned char *)malloc( new_entry_length )) == NULL) { DEBUG(0, ("add_smbfilepwd_entry(malloc): Failed to add entry for user %s to file %s. \ Error was %s\n", newpwd->smb_name, pfile, strerror(errno))); endsmbfilepwent(fp); diff --git a/source3/rpc_server/srv_samr.c b/source3/rpc_server/srv_samr.c index d1503a762e..d0304d0dd6 100644 --- a/source3/rpc_server/srv_samr.c +++ b/source3/rpc_server/srv_samr.c @@ -107,7 +107,7 @@ static void samr_reply_close_hnd(SAMR_Q_CLOSE_HND *q_u, SAMR_R_CLOSE_HND r_u; /* set up the SAMR unknown_1 response */ - bzero(&(r_u.pol.data), POL_HND_SIZE); + bzero(r_u.pol.data, POL_HND_SIZE); /* close the policy handle */ if (close_lsa_policy_hnd(&(q_u->pol))) @@ -795,7 +795,7 @@ static void samr_reply_open_user(SAMR_Q_OPEN_USER *q_u, BOOL pol_open = False; /* set up the SAMR open_user response */ - bzero(&(r_u.user_pol.data), POL_HND_SIZE); + bzero(r_u.user_pol.data, POL_HND_SIZE); r_u.status = 0x0; @@ -1105,7 +1105,7 @@ static void samr_reply_unknown_32(SAMR_Q_UNKNOWN_32 *q_u, SAMR_R_UNKNOWN_32 r_u; /* set up the SAMR unknown_32 response */ - bzero(&(r_u.pol.data), POL_HND_SIZE); + bzero(r_u.pol.data, POL_HND_SIZE); if (status == 0) { for (i = 4; i < POL_HND_SIZE; i++) |