=== modified file 'data/syncdaemon.conf'
--- data/syncdaemon.conf	2011-04-26 18:53:19 +0000
+++ data/syncdaemon.conf	2012-05-22 04:34:39 +0000
@@ -2,7 +2,7 @@
 host.default = fs-1.one.ubuntu.com
 host.help = The server address
 
-dns_srv.default = _https._tcp.fs.ubuntuone.com
+dns_srv.default = _https._tcp.fs.one.ubuntu.com
 dns_srv.help = The DNS SRV record
 
 disable_ssl_verify.default = False

=== modified file 'tests/syncdaemon/test_action_queue.py'
--- tests/syncdaemon/test_action_queue.py	2011-11-18 21:43:59 +0000
+++ tests/syncdaemon/test_action_queue.py	2011-12-15 16:04:46 +0000
@@ -27,7 +27,6 @@
 import operator
 import os
 import unittest
-import urllib2
 import uuid
 
 from functools import wraps
@@ -47,6 +46,7 @@
 from contrib.testing.testcase import (
     BaseTwistedTestCase, DummyClass, FakeMain, FakeActionQueue,
 )
+from ubuntu_sso.utils import curllib
 from ubuntuone.devtools import handlers
 from ubuntuone import logger, clientdefs
 from ubuntuone.platform import open_file, platform, path_exists
@@ -2635,7 +2635,7 @@
         try:
             res = self.command._change_public_access_http()
         finally:
-            action_queue.urlopen = urllib2.urlopen
+            action_queue.urlopen = curllib.urlopen
 
         self.assertEqual(
             {'is_public': True, 'public_url': 'http://example.com'}, res)
@@ -2668,7 +2668,7 @@
     def test_handle_failure_push_event(self):
         """Test AQ_CHANGE_PUBLIC_ACCESS_ERROR is pushed on failure."""
         msg = 'Something went wrong'
-        failure = Failure(urllib2.HTTPError(
+        failure = Failure(curllib.HTTPError(
                 "http://example.com", 500, "Error", [], StringIO(msg)))
         self.command.handle_failure(failure=failure)
         event = ('AQ_CHANGE_PUBLIC_ACCESS_ERROR',
@@ -2756,7 +2756,7 @@
         try:
             res = self.command._get_public_files_http()
         finally:
-            action_queue.urlopen = urllib2.urlopen
+            action_queue.urlopen = curllib.urlopen
         self.assertEqual([{'node_id': str(node_id), 'volume_id': '',
                           'public_url': 'http://example.com'},
                           {'node_id': str(node_id_2),
@@ -2790,7 +2790,7 @@
     def test_handle_failure_push_event(self):
         """Test AQ_PUBLIC_FILES_LIST_ERROR is pushed on failure."""
         msg = 'Something went wrong'
-        failure = Failure(urllib2.HTTPError(
+        failure = Failure(curllib.HTTPError(
                 "http://example.com", 500, "Error", [], StringIO(msg)))
         self.command.handle_failure(failure=failure)
         event = ('AQ_PUBLIC_FILES_LIST_ERROR', {'error': msg})

=== modified file 'ubuntuone/syncdaemon/action_queue.py'
--- ubuntuone/syncdaemon/action_queue.py	2011-11-18 21:43:59 +0000
+++ ubuntuone/syncdaemon/action_queue.py	2012-05-22 04:34:39 +0000
@@ -39,7 +39,6 @@
 from collections import deque, defaultdict
 from functools import partial
 from urllib import urlencode
-from urllib2 import urlopen, Request, HTTPError
 from urlparse import urljoin
 
 import OpenSSL.SSL
@@ -52,6 +51,7 @@
 
 from oauth import oauth
 from ubuntu_sso.utils import timestamp_checker
+from ubuntu_sso.utils.curllib import urlopen, Request, HTTPError
 from ubuntuone import clientdefs
 from ubuntuone.platform import platform, remove_file
 from ubuntuone.storageprotocol import protocol_pb2, content_hash
@@ -815,7 +815,7 @@
     def _make_connection(self, result):
         """Do the real connect call."""
         host, port = result
-        ssl_context = get_ssl_context(self.disable_ssl_verify)
+        ssl_context = get_ssl_context(self.disable_ssl_verify, host)
         if self.use_ssl:
             self.connector = reactor.connectSSL(host, port, factory=self,
                                                 contextFactory=ssl_context,