[sshproxy-dev] sshproxy/SSHproxy pwdb/mysql.py server/server.p...

[David Guerizec]

CVSROOT:        /cvsroot/sshproxy
Module name:    sshproxy
Branch:         
Changes by:     David Guerizec <address@hidden> 06/01/10 14:02:26

Modified files:
        SSHproxy/pwdb  : mysql.py 
        SSHproxy/server: server.py 
Removed files:
        SSHproxy/pwdb  : login.py 

Log message:
        - fixed column name in pwdb.mysql
        - deleted pwdb.login since it is not used

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/sshproxy/sshproxy/SSHproxy/pwdb/mysql.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/sshproxy/sshproxy/SSHproxy/server/server.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: sshproxy/SSHproxy/pwdb/mysql.py
diff -u sshproxy/SSHproxy/pwdb/mysql.py:1.7 sshproxy/SSHproxy/pwdb/mysql.py:1.8
--- sshproxy/SSHproxy/pwdb/mysql.py:1.7 Fri Nov 18 09:39:36 2005
+++ sshproxy/SSHproxy/pwdb/mysql.py     Tue Jan 10 14:02:26 2006
@@ -276,7 +276,7 @@
 
     def list_logins(self):
         q_listlogin = """
-            select name, password, `key` from login
+            select uid, password, `key` from login
         """
         site = db.cursor()
         site.execute(q_listlogin)
@@ -288,7 +288,7 @@
 
     def get_logins(self, uid):
         q_getlogin = """
-            select name, password, `key` from login where uid = '%s'
+            select uid, password, `key` from login where uid = '%s'
         """
         login = db.cursor()
         login.execute(q_getlogin % uid)
@@ -300,7 +300,7 @@
 
     def add_login(self, login, password, key):
         q_addlogin = """
-            insert into login (name, password, `key`) values ('%s','%s','%s')
+            insert into login (uid, password, `key`) values ('%s','%s','%s')
         """
         if self.get_logins(uid):
             return None
Index: sshproxy/SSHproxy/server/server.py
diff -u sshproxy/SSHproxy/server/server.py:1.5 
sshproxy/SSHproxy/server/server.py:1.6
--- sshproxy/SSHproxy/server/server.py:1.5      Thu Oct 27 14:14:36 2005
+++ sshproxy/SSHproxy/server/server.py  Tue Jan 10 14:02:26 2006
@@ -25,7 +25,6 @@
 from sftp import SFTPServer, SFTPServerInterface
 import os.path, os, sys
 from SSHproxy import pwdb
-from SSHproxy.pwdb import login