summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/ipc.c3
-rw-r--r--source3/smbd/quotas.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/source3/smbd/ipc.c b/source3/smbd/ipc.c
index 89b3e36f52..4798188454 100644
--- a/source3/smbd/ipc.c
+++ b/source3/smbd/ipc.c
@@ -1701,7 +1701,8 @@ static BOOL api_SamOEMChangePassword(int cnum,uint16 vuid, char *param,char *dat
fstrcpy(user,p);
p = skip_string(p,1);
- if(check_oem_password( user, data, &smbpw, new_passwd, sizeof(new_passwd)) == False) {
+ if(check_oem_password( user, (unsigned char *)data, &smbpw,
+ new_passwd, (int)sizeof(new_passwd)) == False) {
return True;
}
diff --git a/source3/smbd/quotas.c b/source3/smbd/quotas.c
index 0a366e5ee6..df85f79b9b 100644
--- a/source3/smbd/quotas.c
+++ b/source3/smbd/quotas.c
@@ -115,6 +115,8 @@ BOOL disk_quotas(char *path, int *bsize, int *dfree, int *dsize)
return(False);
}
else {
+ if (D.dqb_bsoftlimit == 0)
+ D.dqb_bsoftlimit = D.dqb_bhardlimit;
*dfree = D.dqb_bsoftlimit - D.dqb_curblocks;
*dsize = D.dqb_bsoftlimit;
}