Changeset 2803

Timestamp:

03/25/06 22:21:30 (18 years ago)

Author:

jerome

Message:

Changed the behavior of the overwrite_jobticket directive : it's now
impossible to overwrite the username when the job has to be denied
or cancelled (although for cancelled I'm not sure if this is a good
or a bad idea).

Location:

pykota/trunk

Files:

• bin/cupspykota (modified) (2 diffs)
• conf/pykota.conf.sample (modified) (2 diffs)

pykota/trunk/bin/cupspykota

@@ -329 +329 @@
                     username = line.split("=", 1)[1].strip()
                     self.logdebug("Seen new username [%s]" % username)
-                    action = None
                 elif line.startswith("BILLINGCODE=") :    
                     billingcode = line.split("=", 1)[1].strip()
                     self.logdebug("Seen new billing code [%s]" % billingcode)
-                    action = None
             inputfile.close()    
             self.dropPriv()
@@ -345 +343 @@
                 self.Reason = _("Print job cancelled.")
                 os.environ["PYKOTASTATUS"] = "CANCELLED"
-            if username :
-                self.UserName = username
+            elif username :
+                self.UserName = username # If cancelled or denied, we don't allow username to be overwritten
             # NB : we overwrite the billing code even if empty    
             self.JobBillingCode = billingcode 

pykota/trunk/conf/pykota.conf.sample

@@ -378 +378 @@
 #    USERNAME=the_username_we_want_to_overwrite_with
 #    BILLINGCODE=the_billingcode_we_want_to_overwrite_with
+#    AUTH=NO (equivalent to DENY below)
 #    DENY 
 #    CANCEL
@@ -388 +389 @@
 # If only BILLINGCODE= lines are printed, the username is
 # used unchanged.
-# If DENY or CANCEL is output, but is followed by new USERNAME= or
-# BILLINGCODE= lines, the job is not denied nor cancelled.
+# If DENY or CANCEL is output, the username can't be overwritten.
 #
 # This value can be set either globally or on a per printer basis