From 1d4873b7cba5212c0aed74666df6d7923bcd26bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Le=20Ninivin?= <cedric.leninivin@tiolive.com>
Date: Mon, 10 Sep 2012 12:42:37 +0200
Subject: [PATCH] fixed problem with login in register
---
slapos/register/register.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/slapos/register/register.py b/slapos/register/register.py
index 4e73defab..7ea67ac75 100644
--- a/slapos/register/register.py
+++ b/slapos/register/register.py
@@ -292,14 +292,14 @@ def register(config):
user_id = get_login()
if check_login(user_id,config.master_url_web): break
config.logger.warning ("Wrong login/password")
- elif config.password == None :
- if not check_login(base64.encodestring('%s:%s' % (config.login,getpass()))[:-1],config.master_url_web):
- config.logger.error ("Wrong login/password")
- return 1
else:
- if not check_login(base64.encodestring('%s:%s' % (config.login,config.password))[:-1],config.master_url_web):
+ if config.password == None :
+ config.password = getpass()
+ user_id = base64.encodestring('%s:%s' % (config.login,config.password))[:-1]
+ if not check_login(user_id,config.master_url_web):
config.logger.error ("Wrong login/password")
return 1
+
# Get source code of page having certificate and key
certificate_key = get_certificates(user_id,config.node_name,config.master_url_web)
# Parse certificate and key and get computer id
--
2.30.9