Changeset 1111 for pykota/trunk

Timestamp:

07/29/03 11:54:03 (21 years ago)

Author:

jalet

Message:

Added configurable LDAP mail attribute support

Location:

pykota/trunk

Files:

• conf/pykota.conf.sample (modified) (1 diff)
• docs/pykota.sgml (modified) (2 diffs)
• NEWS (modified) (1 diff)
• pykota/config.py (modified) (2 diffs)
• pykota/storages/ldapstorage.py (modified) (2 diffs)
• pykota/version.py (modified) (1 diff)
• setup.py (modified) (2 diffs)

pykota/trunk/conf/pykota.conf.sample

@@ -87 +87 @@
 newuser : below
 newgroup : below
+#
+# LDAP attribute which stores the user's email address
+usermail : mail
 
 # 

pykota/trunk/docs/pykota.sgml

@@ -1 @@
-<!DOCTYPE Book PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-
-  <!entity INSTALLATION system "installation.sgml">
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
   <!entity EDPYKOTA system "edpykota.sgml">
   <!entity REPYKOTA system "repykota.sgml">
@@ -98 +96 @@
 
 $Log$
+Revision 1.7  2003/07/29 09:54:03  jalet
+Added configurable LDAP mail attribute support
+
 Revision 1.6  2003/07/25 13:10:58  jalet
 Improved documentation

pykota/trunk/NEWS

@@ -22 +22 @@
 PyKota NEWS :
 
+    - 1.14beta2 :
+    
+        - An LDAP-specific configuration field was introduced, usermail.
+          Use it to specify which LDAP attribute contains a valid email
+          address for the user. See sample configuration file for
+          details. 
+        
     - 1.14beta :
     

pykota/trunk/pykota/config.py

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.35  2003/07/29 09:54:03  jalet
+# Added configurable LDAP mail attribute support
+#
 # Revision 1.34  2003/07/28 09:11:12  jalet
 # PyKota now tries to add its attributes intelligently in existing LDAP
@@ -236 +239 @@
                         "jobbase", "lastjobbase", \
                         "newuser", "newgroup", \
+                        "usermail", \
                       ] :
             ldapinfo[option] = self.getGlobalOption(option).strip()

pykota/trunk/pykota/storages/ldapstorage.py

@@ -21 +21 @@
 #
 # $Log$
+# Revision 1.22  2003/07/29 09:54:03  jalet
+# Added configurable LDAP mail attribute support
+#
 # Revision 1.21  2003/07/28 09:11:12  jalet
 # PyKota now tries to add its attributes intelligently in existing LDAP
@@ -219 +222 @@
             fields = result[0][1]
             user.ident = result[0][0]
+            user.Email = fields.get(self.info["usermail"])
+            if user.Email is not None :
+                user.Email = user.Email[0]
             user.LimitBy = fields.get("pykotaLimitBy")
             if user.LimitBy is not None :

pykota/trunk/pykota/version.py

@@ -21 +21 @@
 #
 
-__version__ = "1.14beta_unofficial"
+__version__ = "1.14beta2_unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS and LPRng."""

pykota/trunk/setup.py

@@ -23 +23 @@
 #
 # $Log$
+# Revision 1.22  2003/07/29 09:54:03  jalet
+# Added configurable LDAP mail attribute support
+#
 # Revision 1.21  2003/07/28 09:11:12  jalet
 # PyKota now tries to add its attributes intelligently in existing LDAP
@@ -248 +251 @@
         # warns for new LDAP fields    
         if sb.get("storagebackend") == "ldapstorage" :    
+            usermail = conf.getGlobalOption("usermail", ignore=1)
             newuser = conf.getGlobalOption("newuser", ignore=1)
             newgroup = conf.getGlobalOption("newgroup", ignore=1)
-            if not (newuser and newgroup) :
-                sys.stderr.write("From version 1.14 on, PyKota LDAP Support needs two additional configuration fields.\n")
-                sys.stderr.write("Please put the 'newuser' and 'newgroup' configuration fields in a [global] section in /etc/pykota/pykota.conf\n")
+            if not (usermail and newuser and newgroup) :
+                sys.stderr.write("From version 1.14 on, PyKota LDAP Support needs three additional configuration fields.\n")
+                sys.stderr.write("Please put the 'usermail', 'newuser' and 'newgroup' configuration fields in a\n[global] section in /etc/pykota/pykota.conf\n")
                 sys.stderr.write("You can look at the conf/pykota.conf.sample file for examples.\n")
                 sys.stderr.write("YOU HAVE TO DO THESE MODIFICATIONS MANUALLY, AND RESTART THE INSTALLATION.\n")