From f283e3d44cac8521cb3536f49e0e8ce77411cec9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Fri, 2 Nov 2012 09:03:46 +0400 Subject: [PATCH] Fix work with certs --- .gitignore | 8 -------- console/application/cert_func.py | 4 ++++ 2 files changed, 4 insertions(+), 8 deletions(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 279d4d2..0000000 --- a/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -.* -build -*.pyc -*.kate-swp -*.mo -mymake -.gitignore -Makefile diff --git a/console/application/cert_func.py b/console/application/cert_func.py index 1c824ba..67dc3d7 100644 --- a/console/application/cert_func.py +++ b/console/application/cert_func.py @@ -39,6 +39,8 @@ def client_post_cert (client, clVars, show_info = False): result_post_cert = _result_post_cert[1].integer result_sid = _result_sid[1].integer + print _('client uses certificate %s') %client.CERT_FILE + print result_post_cert[0] if result_post_cert[0] == -4: print _("Certificate not found on the server") print _('client uses certificate %s') %client.CERT_FILE @@ -49,6 +51,8 @@ def client_post_cert (client, clVars, show_info = False): # client_sid(sid, client, cert_id = results[0][0], clVars = clVars) if result_post_cert[0] == -3: print _("Certificate not sent!") + elif result_post_cert[0] == -2: + print _("Using upstreamer cert") else: if show_info: print _(" Your certifitate ID = %d") %(result_post_cert[0])