On 17/12/13 15:47, Stephen Herr wrote:
> Unless I'm mistaken the patch attached to your second email is the same
> as the patch in your first. Want to send me the second one before I
> commit it?
You are right. That's the right patch I indented to send.
Cheers
Flavio
--
Flavio Castelli
SUSE LINUX Products GmbH
Maxfeldstraße 5, 90409 Nürnberg Germany
>From 3f2d33b7e1def499d3faebcdcf8da544bc0596d1 Mon Sep 17 00:00:00 2001
From: Flavio Castelli <fcaste...@suse.com>
Date: Tue, 17 Dec 2013 15:06:16 +0100
Subject: [PATCH] More fixes for client registration via proxy
Fixed other parts of the client registration process via proxy which
got broken by commit 251005196b02b.
---
proxy/proxy/broker/rhnBroker.py | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/proxy/proxy/broker/rhnBroker.py b/proxy/proxy/broker/rhnBroker.py
index a9194ca..5734c4d 100644
--- a/proxy/proxy/broker/rhnBroker.py
+++ b/proxy/proxy/broker/rhnBroker.py
@@ -187,10 +187,15 @@ class BrokerHandler(SharedHandler):
_oto['X-RHN-IP-Path'] = ip_path
# NOTE: X-RHN-Proxy-Auth described in broker/rhnProxyAuth.py
- log_debug(5, 'X-RHN-Proxy-Auth currently set to: %s' % repr(_oto['X-RHN-Proxy-Auth']))
+ if 'X-RHN-Proxy-Auth' in _oto:
+ log_debug(5, 'X-RHN-Proxy-Auth currently set to: %s' % repr(_oto['X-RHN-Proxy-Auth']))
+ else:
+ log_debug(5, 'X-RHN-Proxy-Auth is not set')
if self.req.headers_in.has_key('X-RHN-Proxy-Auth'):
- tokens = _oto['X-RHN-Proxy-Auth'].split(',')
+ tokens = []
+ if 'X-RHN-Proxy-Auth' in _oto:
+ tokens = _oto['X-RHN-Proxy-Auth'].split(',')
log_debug(5, 'Tokens: %s' % tokens)
# GETs: authenticate user, and service local GETs.
--
1.8.4
_______________________________________________
Spacewalk-devel mailing list
Spacewalk-devel@redhat.com
https://www.redhat.com/mailman/listinfo/spacewalk-devel
