Update of /cvsroot/pybot/pybot/pybot/modules
In directory sc8-pr-cvs1:/tmp/cvs-serv24568/modules
Modified Files:
xmlrpc.py
Log Message:
- Fixed xmlrpc SQL statement in hasperm() method.
- Disabled message sending amortization for now.
Index: xmlrpc.py
===================================================================
RCS file: /cvsroot/pybot/pybot/pybot/modules/xmlrpc.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** xmlrpc.py 12 May 2003 20:42:21 -0000 1.3
--- xmlrpc.py 12 May 2003 23:02:58 -0000 1.4
***************
*** 71,79 ****
self.server.socket.setblocking(0)
- rm.register("sendmsg", self.rm_sendmsg)
-
xro = XmlRpcObject(rm.get_methods(), self.hasperm)
self.server.register_instance(xro)
hooks.register("Message", self.message)
hooks.register("Loop", self.loop)
--- 71,79 ----
self.server.socket.setblocking(0)
xro = XmlRpcObject(rm.get_methods(), self.hasperm)
self.server.register_instance(xro)
+ rm.register("sendmsg", self.rm_sendmsg)
+
hooks.register("Message", self.message)
hooks.register("Loop", self.loop)
***************
*** 224,228 ****
cursor.execute("select * from xmlrpcperm "
"natural left join xmlrpcuser where "
! "username=%s and password=%s and "
"(servername isnull or servername=%s) and "
"(target isnull or target=%s)",
--- 224,228 ----
cursor.execute("select * from xmlrpcperm "
"natural left join xmlrpcuser where "
! "xmlrpcuser.username=%s and password=%s and "
"(servername isnull or servername=%s) and "
"(target isnull or target=%s)",
|
