--- a/server/serverctl.py	Tue Dec 22 09:33:08 2009 +0100
+++ b/server/serverctl.py	Tue Dec 22 09:38:08 2009 +0100
@@ -57,7 +57,8 @@
         else:
             password = getpass('password: ')
     return get_connection(driver, dbhost, dbname, user, password=password,
-                          port=source.get('db-port'))
+                          port=source.get('db-port'),
+                          extra_args=source.get('db-extra-arguments'))
 
 def system_source_cnx(source, dbms_system_base=False,
                       special_privs='CREATE/DROP DATABASE', verbose=True):
@@ -368,7 +369,8 @@
             get_connection(
                 system['db-driver'], database=system['db-name'],
                 host=system.get('db-host'), port=system.get('db-port'),
-                user=system.get('db-user'), password=system.get('db-password'))
+                user=system.get('db-user'), password=system.get('db-password'), 
+                extra_args=system.get('db-extra-arguments'))
         except Exception, ex:
             raise ConfigurationError(
                 'You seem to have provided wrong connection information in '\