Attachment 1840 Details for Bug 3524 – Proposed patch for samba 3.0.22

[patch] Proposed patch for samba 3.0.22

patch-quota (text/plain), 1.69 KB, created by Alex Deiter on 2006-04-04 07:43:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deiter

Created: 2006-04-04 07:43:56 UTC

Size: 1.69 KB

patch

obsolete

>--- source/smbd/quotas.c.orig	Tue Apr  4 16:36:58 2006
>+++ source/smbd/quotas.c	Tue Apr  4 16:38:22 2006
>@@ -2,6 +2,7 @@
>    Unix SMB/CIFS implementation.
>    support for quotas
>    Copyright (C) Andrew Tridgell 1992-1998
>+   Copyright (C) Alex Deiter 2006
>    
>    This program is free software; you can redistribute it and/or modify
>    it under the terms of the GNU General Public License as published by
>@@ -587,7 +588,6 @@
> 	int file;
> 	static struct mnttab mnt;
> 	static pstring name;
>-	pstring devopt;
> #else /* SunOS4 */
> 	struct mntent *mnt;
> 	static pstring name;
>@@ -604,7 +604,8 @@
> 		return(False) ;
>   
> 	devno = sbuf.st_dev ;
>-	DEBUG(5,("disk_quotas: looking for path \"%s\" devno=%x\n", path,(unsigned int)devno));
>+	DEBUG(5,("disk_quotas: looking for path \"%s\" devno=%x\n",
>+		path, (unsigned int)devno));
> 	if ( devno != devno_cached ) {
> 		devno_cached = devno ;
> #if defined(SUNOS5)
>@@ -612,17 +613,19 @@
> 			return(False) ;
>     
> 		found = False ;
>-		slprintf(devopt, sizeof(devopt) - 1, "dev=%x", (unsigned int)devno);
>+
> 		while (getmntent(fd, &mnt) == 0) {
>-			if( !hasmntopt(&mnt, devopt) )
>+			if (sys_stat(mnt.mnt_mountp, &sbuf) == -1)
> 				continue;
> 
>-			DEBUG(5,("disk_quotas: testing \"%s\" %s\n", mnt.mnt_mountp,devopt));
>+			DEBUG(5,("disk_quotas: testing \"%s\" devno=%x\n",
>+				mnt.mnt_mountp, (unsigned int)devno));
> 
> 			/* quotas are only on vxfs, UFS or NFS */
>-			if ( strcmp( mnt.mnt_fstype, MNTTYPE_UFS ) == 0 ||
>+			if ( (sbuf.st_dev == devno) && (
>+				strcmp( mnt.mnt_fstype, MNTTYPE_UFS ) == 0 ||
> 				strcmp( mnt.mnt_fstype, "nfs" ) == 0    ||
>-				strcmp( mnt.mnt_fstype, "vxfs" ) == 0  ) { 
>+				strcmp( mnt.mnt_fstype, "vxfs" ) == 0 )) { 
> 					found = True ;
> 					break;
> 			}

Actions: View

Attachments on bug 3524: 1741 | 1840 | 2184