Changeset 1757 for pykota/trunk/pykota

Timestamp:

09/29/04 22:20:52 (20 years ago)

Author:

jalet

Message:

Added the winbind_separator directive to pykota.conf to allow the admin to
strip out the Samba/Winbind domain name when users print.

Location:

pykota/trunk/pykota

Files:

• config.py (modified) (2 diffs)
• tool.py (modified) (2 diffs)
• version.py (modified) (1 diff)

pykota/trunk/pykota/config.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.52  2004/09/29 20:20:52  jalet
+# Added the winbind_separator directive to pykota.conf to allow the admin to
+# strip out the Samba/Winbind domain name when users print.
+#
 # Revision 1.51  2004/08/31 23:29:53  jalet
 # Introduction of the new 'onaccountererror' configuration directive.
@@ -530 +534 @@
         """Returns 1 if we want to convert usernames to lowercase when printing, else 0."""
         return self.isTrue(self.getGlobalOption("utolower", ignore=1))
+        
+    def getWinbindSeparator(self) :          
+        """Returns the winbind separator's value if it is set, else None."""
+        return self.getGlobalOption("winbind_separator", ignore=1)

pykota/trunk/pykota/tool.py

@@ -22 +22 @@
 #
 # $Log$
+# Revision 1.123  2004/09/29 20:20:52  jalet
+# Added the winbind_separator directive to pykota.conf to allow the admin to
+# strip out the Samba/Winbind domain name when users print.
+#
 # Revision 1.122  2004/09/28 21:38:56  jalet
 # Now computes the job's datas MD5 checksum to later forbid duplicate print jobs.
@@ -959 +963 @@
         
         self.username = self.username or 'root' # when printing test page from CUPS web interface, username is empty
+        
+        # do we want to strip out the Samba/Winbind domain name ?
+        separator = self.config.getWinbindSeparator()
+        if separator is not None :
+            self.username = self.username.split(separator)[-1]
+            
+        # do we want to lowercase usernames ?    
         if self.config.getUserNameToLower() :
             self.username = self.username.lower()
+            
         self.preserveinputfile = self.inputfile 
         try :

pykota/trunk/pykota/version.py

@@ -22 +22 @@
 #
 
-__version__ = "1.20alpha17_unofficial"
+__version__ = "1.20alpha18_unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS and LPRng."""