Changeset 1785 for pykota/trunk/bin

Timestamp:

10/06/04 12:05:47 (20 years ago)

Author:

jalet

Message:

Minor changes to allow any PyKota administrator to launch enhanced versions
of the commands, and not only the root user.

Location:

pykota/trunk/bin

Files:

• dumpykota (modified) (2 diffs)
• pykosd (modified) (2 diffs)
• pykotme (modified) (2 diffs)
• repykota (modified) (4 diffs)
• warnpykota (modified) (3 diffs)

pykota/trunk/bin/dumpykota

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.10  2004/10/06 10:05:47  jalet
+# Minor changes to allow any PyKota administrator to launch enhanced versions
+# of the commands, and not only the root user.
+#
 # Revision 1.9  2004/10/05 20:08:46  jalet
 # Misleading help message. Thx to Johannes Laemmermann.
@@ -149 +153 @@
     def main(self, arguments, options) :
         """Print Quota Data Dumper."""
+        if not self.config.isAdmin :
+            raise PyKotaToolError, _("You're not allowed to dump PyKota's datas.")
+            
         datatype = options["data"]
         if datatype not in [ "history",

pykota/trunk/bin/pykosd

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.8  2004/10/06 10:05:47  jalet
+# Minor changes to allow any PyKota administrator to launch enhanced versions
+# of the commands, and not only the root user.
+#
 # Revision 1.7  2004/07/20 22:42:26  jalet
 # pykosd now supports setting color
@@ -141 +145 @@
         savecolor = color
         
-        uid = os.geteuid()
-        uname = pwd.getpwuid(uid)[0]
+        uname = pwd.getpwuid(os.geteuid())[0]
         while 1 :
             color = savecolor

pykota/trunk/bin/pykotme

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.14  2004/10/06 10:05:47  jalet
+# Minor changes to allow any PyKota administrator to launch enhanced versions
+# of the commands, and not only the root user.
+#
 # Revision 1.13  2004/07/01 19:56:42  jalet
 # Better dispatching of error messages
@@ -157 +161 @@
             
         # get current user
-        uid = os.geteuid()
-        username = pwd.getpwuid(uid)[0]
+        username = pwd.getpwuid(os.geteuid())[0]
         user = self.storage.getUser(username)
         if user.Exists and user.LimitBy and (user.LimitBy.lower() == "balance"):

pykota/trunk/bin/repykota

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.50  2004/10/06 10:05:47  jalet
+# Minor changes to allow any PyKota administrator to launch enhanced versions
+# of the commands, and not only the root user.
+#
 # Revision 1.49  2004/06/18 13:34:49  jalet
 # Now all tracebacks include PyKota's version number
@@ -239 +243 @@
   with "laser" or ends with "pson".
   
-  If launched by a non-root user, additionnal arguments representing
-  users or groups names are ignored, and only the current user/group
-  is reported.
+  If launched by an user who is not a PyKota administrator, additionnal
+  arguments representing users or groups names are ignored, and only the
+  current user/group is reported.
 
 This program is free software; you can redistribute it and/or modify
@@ -263 +267 @@
     def main(self, ugnames, options) :
         """Print Quota reports generator."""
-        uid = os.geteuid()
-        if not uid :
-            # root user
+        if self.config.isAdmin :
+            # PyKota administrator
             if not ugnames :
                 # no username, means all usernames
@@ -272 +275 @@
             # not the root user
             # reports only the current user
-            username = pwd.getpwuid(uid)[0]
+            username = pwd.getpwuid(os.geteuid())[0]
             if options["groups"] :
                 user = self.storage.getUser(username)

pykota/trunk/bin/warnpykota

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.30  2004/10/06 10:05:47  jalet
+# Minor changes to allow any PyKota administrator to launch enhanced versions
+# of the commands, and not only the root user.
+#
 # Revision 1.29  2004/06/18 13:34:49  jalet
 # Now all tracebacks include PyKota's version number
@@ -171 +175 @@
   with "laserjet"
   
-  If launched by a non-root user, additionnal arguments representing
-  users or groups names are ignored, and only the current user/group
-  is warned.
+  If launched by an user who is not a PyKota administrator, additionnal
+  arguments representing users or groups names are ignored, and only the
+  current user/group is reported.
 
 This program is free software; you can redistribute it and/or modify
@@ -195 +199 @@
     def main(self, ugnames, options) :
         """Warn users or groups over print quota."""
-        uid = os.geteuid()
-        if not uid :
-            # root user
+        if self.config.isAdmin :
+            # PyKota administrator
             if not ugnames :
                 # no username, means all usernames
                 ugnames = [ "*" ]
         else :        
-            # not the root user
+            # not a PyKota administrator
             # warns only the current user
             # the utility of this is discutable, but at least it
             # protects other users from mail bombing if they are
             # over quota.
-            username = pwd.getpwuid(uid)[0]
+            username = pwd.getpwuid(os.geteuid())[0]
             if options["groups"] :
                 user = self.storage.getUser(username)