svn commit: samba r12076 - branches/SAMBA_3_0/source/smbd trunk/source/smbd

[lmuelle at samba.org]

Author: lmuelle
Date: 2005-12-05 16:51:19 +0000 (Mon, 05 Dec 2005)
New Revision: 12076

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12076

Log:
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.

Modified:
   branches/SAMBA_3_0/source/smbd/quotas.c
   trunk/source/smbd/quotas.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/quotas.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/quotas.c	2005-12-05 15:47:15 UTC (rev 12075)
+++ branches/SAMBA_3_0/source/smbd/quotas.c	2005-12-05 16:51:19 UTC (rev 12076)
@@ -216,7 +216,9 @@
 
 	devno = S.st_dev ;
   
-	fp = setmntent(MOUNTED,"r");
+	if ((fp = setmntent(MOUNTED,"r")) == NULL)
+		return(False) ;
+
 	found = False ;
   
 	while ((mnt = getmntent(fp))) {

Modified: trunk/source/smbd/quotas.c
===================================================================
--- trunk/source/smbd/quotas.c	2005-12-05 15:47:15 UTC (rev 12075)
+++ trunk/source/smbd/quotas.c	2005-12-05 16:51:19 UTC (rev 12076)
@@ -216,7 +216,9 @@
 
 	devno = S.st_dev ;
   
-	fp = setmntent(MOUNTED,"r");
+	if ((fp = setmntent(MOUNTED,"r")) == NULL)
+		return(False) ;
+
 	found = False ;
   
 	while ((mnt = getmntent(fp))) {