Changeset 2804 for pykota/trunk/bin/pknotify

Timestamp:

03/25/06 22:22:07 (18 years ago)

Author:

jerome

Message:

Ensures that all texts sent by pknotify to a remote pykoticon server
are UTF-8 encoded.

Files:

• pykota/trunk/bin/pknotify (modified) (4 diffs)

pykota/trunk/bin/pknotify

@@ -152 +152 @@
     def sanitizeMessage(self, msg) :
         """Replaces \\n and returns a messagee in xmlrpclib Binary format."""
-        return xmlrpclib.Binary(msg.replace("\\n", "\n"))
+        return xmlrpclib.Binary(self.userCharsetToUTF8(msg.replace("\\n", "\n")))
         
     def convPAM(self, auth, queries=[], userdata=None) :
@@ -243 +243 @@
                     if options["checkauth"] :
                         if ("username" in varnames) and ("password" in varnames) :
-                            if self.checkAuth(result["username"].data, result["password"].data) :
+                            if self.checkAuth(self.UTF8ToUserCharset(result["username"].data[:]), 
+                                              self.UTF8ToUserCharset(result["password"].data[:])) :
                                 authok = "AUTH=YES"
                             else :    
@@ -252 +253 @@
                         if (varname != "password") \
                            and ((varname != "username") or (authok in (None, "AUTH=YES"))) :
-                            print "%s=%s" % (varname.upper(), result[varname].data)
+                            print "%s=%s" % (varname.upper(), self.UTF8ToUserCharset(result[varname].data[:]))
                     if authok is not None :        
                         print authok        
@@ -275 +276 @@
     try :
         defaults = { \
-                     "denyafter" : 1,
+                     "denyafter" : 0,
                      "timeout" : 0,
                    }