X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Frquotad%2Frquota_server.c;h=bef99c7d503622fd2a75d94edb167e1f3c95875f;hp=e9167ca19692a3bbaf7f374614c74c53d894f654;hb=d6a3885164e3c58e355feb4a7b94176ae127343d;hpb=c42934f59eb943f905862f26799cc3b29ed39216

diff --git a/utils/rquotad/rquota_server.c b/utils/rquotad/rquota_server.c
index e9167ca..bef99c7 100644
--- a/utils/rquotad/rquota_server.c
+++ b/utils/rquotad/rquota_server.c
@@ -26,6 +26,7 @@
 #include <sys/stat.h>
 #include <sys/param.h>
 #include <sys/quota.h>
+#include <sys/vfs.h>
 #include <dirent.h>
 #include <paths.h>
 #include <stdio.h>
@@ -71,7 +72,8 @@ getquota_rslt *getquotainfo(int flags, caddr_t *argp, struct svc_req *rqstp)
    char *pathname, *qfpathname;
    int fd, err, id, type;
    struct stat st;
-
+   struct statfs stf;
+   
    /*
     * First check authentication.
     */
@@ -116,12 +118,11 @@ getquota_rslt *getquotainfo(int flags, caddr_t *argp, struct svc_req *rqstp)
 	  || stat(pathname, &st) == -1)
          break;
 
-#if 0
-      result.getquota_rslt_u.gqr_rquota.rq_bsize = st.st_blksize;
-#else
-      /* All blocks reported are 512 Bytes blocks. */
-      result.getquota_rslt_u.gqr_rquota.rq_bsize = 512;
-#endif
+      if (statfs(pathname, &stf) == -1) {
+	  result.status = Q_EPERM;
+	  return (&result);
+      }
+      result.getquota_rslt_u.gqr_rquota.rq_bsize = stf.f_bsize;
 
       if (hasquota(mnt, type, &qfpathname)) {
          if ((err = quotactl(QCMD(Q_GETQUOTA, type), mnt->mnt_fsname,