Changeset 1821

Timestamp:

10/13/04 23:40:10 (20 years ago)

Author:

jalet

Message:

Now mandates that the user be a PyKota administrator to allow dangerous
command line options. --list is still allowed to mere mortals though.

Location:

pykota/trunk

Files:

• bin/pkprinters (modified) (3 diffs)
• NEWS (modified) (1 diff)

pykota/trunk/bin/pkprinters

@@ -24 +24 @@
 #
 # $Log$
+# Revision 1.17  2004/10/13 21:40:10  jalet
+# Now mandates that the user be a PyKota administrator to allow dangerous
+# command line options. --list is still allowed to mere mortals though.
+#
 # Revision 1.16  2004/10/11 22:53:05  jalet
 # Postponed string interpolation to help message's output method
@@ -78 +82 @@
 #
 
+import os
 import sys
+import pwd
 
 from pykota.tool import PyKotaTool, PyKotaToolError, crashed, N_
@@ -180 +186 @@
     def main(self, names, options) :
         """Manage printers."""
+        if (not self.config.isAdmin) and (not options["list"]) :
+            raise PyKotaToolError, "%s : %s" % (pwd.getpwuid(os.geteuid())[0], _("You're not allowed to use this command."))
+            
         if options["list"] and not names :
             names = ["*"]

pykota/trunk/NEWS

@@ -24 +24 @@
     - 1.20alpha25 :
     
+        - pkprinters allows --list to normal users, but require user
+          to be a PyKota administrator when another command line 
+          option is used.
+          
         - pkhint doesn't use absolute path to search for helper commands
           anymore.