summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Müller <lmuelle@samba.org>2005-12-05 16:51:19 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 11:05:43 -0500
commitf6a46f3329683217ec5c71b8a5bf9b8322df023f (patch)
tree6f52d038030e451305fb3dffbe65e29ca801f246
parentefbbd89000604e8f75521954b94ebc4dd008cd52 (diff)
downloadsamba-f6a46f3329683217ec5c71b8a5bf9b8322df023f.tar.gz
samba-f6a46f3329683217ec5c71b8a5bf9b8322df023f.tar.bz2
samba-f6a46f3329683217ec5c71b8a5bf9b8322df023f.zip
r12076: Ensure setmntent() returns with != NULL in the disk_quotas() Linux
version. The IRIX 6.2 version is still without this check as I'm not sure if setmntent() is implemented in the same way. (This used to be commit 519ed7ca0ecffbc341c7516758a678af59f98586)
-rw-r--r--source3/smbd/quotas.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/smbd/quotas.c b/source3/smbd/quotas.c
index 8cb94bca3d..de31376d6c 100644
--- a/source3/smbd/quotas.c
+++ b/source3/smbd/quotas.c
@@ -216,7 +216,9 @@ BOOL disk_quotas(const char *path, SMB_BIG_UINT *bsize, SMB_BIG_UINT *dfree, SMB
devno = S.st_dev ;
- fp = setmntent(MOUNTED,"r");
+ if ((fp = setmntent(MOUNTED,"r")) == NULL)
+ return(False) ;
+
found = False ;
while ((mnt = getmntent(fp))) {