From 71e942079f535a36adaf7be19da43a6c6ff739da Mon Sep 17 00:00:00 2001
From: Firstname Lastname <email_address>
Date: Wed, 9 Mar 2016 09:21:26 +0100
Subject: [PATCH] add support to set the ice version to support older ice
 versions

---
 Authenticators/LDAP/LDAPauth.ini | 3 +++
 Authenticators/LDAP/LDAPauth.py  | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Authenticators/LDAP/LDAPauth.ini b/Authenticators/LDAP/LDAPauth.ini
index a0b22f5..d90cc35 100644
--- a/Authenticators/LDAP/LDAPauth.ini
+++ b/Authenticators/LDAP/LDAPauth.ini
@@ -42,6 +42,9 @@ group_attr = uniqueMember
 [murmur]
 ;List of virtual server IDs, empty = all
 servers      = 
+; Uncomment to set the ice version used by this script to 1.0
+; ice_version = 1.0
+
 
 ;Logging configuration
 [log]
diff --git a/Authenticators/LDAP/LDAPauth.py b/Authenticators/LDAP/LDAPauth.py
index d5e2146..8099420 100644
--- a/Authenticators/LDAP/LDAPauth.py
+++ b/Authenticators/LDAP/LDAPauth.py
@@ -159,7 +159,8 @@ def x2bool(s):
                    
             'iceraw':None,
                    
-            'murmur':(('servers', lambda x:map(int, x.split(',')), []),),
+            'murmur':(('servers', lambda x:map(int, x.split(',')), []),
+                       ("ice_version", float, 1.1)),
             'glacier':(('enabled', x2bool, False),
                        ('user', str, 'ldapauth'),
                        ('password', str, 'secret'),
@@ -251,7 +252,7 @@ def initializeIceConnection(self):
                 #TODO: Implement this
     
             info('Connecting to Ice server (%s:%d)', cfg.ice.host, cfg.ice.port)
-            base = ice.stringToProxy('Meta:tcp -h %s -p %d' % (cfg.ice.host, cfg.ice.port))
+            base = ice.stringToProxy('Meta -e %.1f:tcp -h %s -p %d' % (cfg.murmur.ice_version, cfg.ice.host, cfg.ice.port))
             self.meta = Murmur.MetaPrx.uncheckedCast(base)
         
             adapter = ice.createObjectAdapterWithEndpoints('Callback.Client', 'tcp -h %s' % cfg.ice.host)