summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>1998-03-24 00:37:53 +0000
committerJeremy Allison <jra@samba.org>1998-03-24 00:37:53 +0000
commit5d7c8375e4ffb017ef0f9eed7e619e533b3e8d12 (patch)
treef899a5c26bd29c518a32b0f57988c1a3e0ab277d /source3/smbd
parent4ddd855d706df5d3aacfcc0121a926d6f43cae02 (diff)
downloadsamba-5d7c8375e4ffb017ef0f9eed7e619e533b3e8d12.tar.gz
samba-5d7c8375e4ffb017ef0f9eed7e619e533b3e8d12.tar.bz2
samba-5d7c8375e4ffb017ef0f9eed7e619e533b3e8d12.zip
clientgen.c ipc.c smbpasswd.c: Fixes for warnings (from Herb).
quotas.c: Linux quota fix. util.c: Ensure smb_read_error is zero in all calls that can set it. lib/rpc/include/rpc_misc.h lib/rpc/include/rpc_netlogon.h lib/rpc/parse/parse_misc.c lib/rpc/parse/parse_net.c lib/rpc/server/srv_netlog.c : Modify Luke's code to call SamOEMhash(). Jeremy. (This used to be commit 7f749708383b8b36c3f23a5fbc5cbdf39bc8e555)
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;
}