Changeset 26 for trunk/samba/source/smbd/quotas.c

Timestamp:

Apr 10, 2007, 7:27:38 AM (18 years ago)

Author:

Paul Smedley

Message:

Updated source to 3.0.25rc1

File:

• trunk/samba/source/smbd/quotas.c (modified) (15 diffs)

trunk/samba/source/smbd/quotas.c

@@ -239 +239 @@
                 return(False);
 
-        become_root_uid_only();
+        become_root();
 
         if (strcmp(mnt->mnt_type, "xfs")==0) {
@@ -252 +252 @@
         }
 
-        unbecome_root_uid_only();
+        unbecome_root();
 
         /* Use softlimit to determine disk space, except when it has been exceeded */
@@ -656 +656 @@
                 return(False) ;
 
-        become_root_uid_only();
+        become_root();
 
 #if defined(SUNOS5)
@@ -663 +663 @@
                 DEBUG(5,("disk_quotas: looking for mountpath (NFS) \"%s\"\n", mnt.mnt_special));
                 retval = nfs_quotas(mnt.mnt_special, euser_id, bsize, dfree, dsize);
-                unbecome_root_uid_only();
+                unbecome();
                 return retval;
         }
@@ -669 +669 @@
         DEBUG(5,("disk_quotas: looking for quotas file \"%s\"\n", name));
         if((file=sys_open(name, O_RDONLY,0))<0) {
-                unbecome_root_uid_only();
+                unbecome_root();
                 return(False);
         }
@@ -682 +682 @@
 #endif
 
-        unbecome_root_uid_only();
+        unbecome_root();
 
         if (ret < 0) {
@@ -842 +842 @@
 
   euser_id=geteuid();
-  become_root_uid_only();
+  become_root();
 
   /* Use softlimit to determine disk space, except when it has been exceeded */
@@ -852 +852 @@
     r=quotactl (Q_GETQUOTA, mnt->mnt_fsname, euser_id, (caddr_t) &D);
 
-    unbecome_root_uid_only();
+    unbecome_root();
 
     if (r==-1)
@@ -883 +883 @@
     r=quotactl (Q_XGETQUOTA, mnt->mnt_fsname, euser_id, (caddr_t) &F);
 
-    unbecome_root_uid_only();
+    unbecome_root();
 
     if (r==-1)
@@ -917 +917 @@
   else
   {
-          unbecome_root_uid_only();
+          unbecome_root();
           return(False);
   }
@@ -937 +937 @@
 #define dqb_fhardlimit dqb_ihardlimit
 #define dqb_fsoftlimit dqb_isoftlimit
+#ifdef _AIXVERSION_530 
+#include <sys/statfs.h>
+#include <sys/vmount.h>
+#endif /* AIX 5.3 */
 #else /* !__FreeBSD__ && !AIX && !__OpenBSD__ && !__DragonFly__ */
 #include <sys/quota.h>
@@ -1181 +1185 @@
 #endif
     
-    become_root_uid_only();
+    become_root();
 
 #if defined(__FreeBSD__) || defined(__DragonFly__)
@@ -1187 +1191 @@
         BOOL retval;
         retval = nfs_quotas(mnts[i].f_mntfromname,euser_id,bsize,dfree,dsize);
-        unbecome_root_uid_only();
+        unbecome_root();
         return retval;
     }
@@ -1201 +1205 @@
     }
 
-    unbecome_root_uid_only();
+    unbecome_root();
   }
 #elif defined(AIX)
   /* AIX has both USER and GROUP quotas: 
      Get the USER quota (ohnielse@fysik.dtu.dk) */
+#ifdef _AIXVERSION_530
+  {
+    struct statfs statbuf;
+    quota64_t user_quota;
+    if (statfs(path,&statbuf) != 0)
+      return False;
+    if(statbuf.f_vfstype == MNT_J2)
+    {
+    /* For some reason we need to be root for jfs2 */
+      become_root();
+      r = quotactl(path,QCMD(Q_J2GETQUOTA,USRQUOTA),euser_id,(char *) &user_quota);
+      unbecome_root();
+    /* Copy results to old struct to let the following code work as before */
+      D.dqb_curblocks  = user_quota.bused;
+      D.dqb_bsoftlimit = user_quota.bsoft;
+      D.dqb_bhardlimit = user_quota.bhard;
+    }
+    else if(statbuf.f_vfstype == MNT_JFS)
+    {
+#endif /* AIX 5.3 */
   save_re_uid();
   if (set_re_uid() != 0) 
@@ -1211 +1235 @@
   r= quotactl(path,QCMD(Q_GETQUOTA,USRQUOTA),euser_id,(char *) &D);
   restore_re_uid();
+#ifdef _AIXVERSION_530
+    }
+    else
+      r = 1; /* Fail for other FS-types */
+  }
+#endif /* AIX 5.3 */
 #else /* !__FreeBSD__ && !AIX && !__OpenBSD__ && !__DragonFly__ */
   r=quotactl(Q_GETQUOTA, dev_disk, euser_id, &D);