Better munging if we are using a service

diff --git a/bucardo b/bucardo
index 2cdef173d780cad8cad6bf002da0080bb78bbd4c..bed06865050f6452216d3dcf87279308b4b75094 100755 (executable)
--- a/bucardo
+++ b/bucardo
@@ -1427,6 +1427,8 @@ sub add_database {
     if (exists $vals->{dbservice}) {
         delete $vals->{dbport};
         delete $vals->{dbhost};
+        $cols =~ s/dbhost,dbport,//;
+        $phs =~ s/\Q?,?,//;
     }
 
     ## Attempt to insert this into the database