Changeset: dbf369d428af for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/dbf369d428af
Modified Files:
clients/mapilib/connect.c
clients/mapilib/mapi.c
Branch: monetdburl
Log Message:
Recognize that for libmapi port 0 means 'no port'
diffs (25 lines):
diff --git a/clients/mapilib/connect.c b/clients/mapilib/connect.c
--- a/clients/mapilib/connect.c
+++ b/clients/mapilib/connect.c
@@ -103,6 +103,8 @@ scan_unix_sockets(Mapi mid)
return mapi_setError(mid, "malloc failed",
__func__, MERROR);
}
msettings_error errmsg =
msetting_set_long(mid->settings, MP_PORT, candidates[i].port);
+ if (!errmsg)
+ errmsg = msettings_validate(mid->settings);
if (errmsg) {
mapi_setError(mid, errmsg, __func__, MERROR);
msettings_destroy(mid->settings);
diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -1867,7 +1867,8 @@ mapi_mapi(const char *host, int port, co
break;
if (dbname && (err = msetting_set_string(settings, MP_DATABASE,
dbname)))
break;
- err = msetting_set_long(settings, MP_PORT, port);
+ if (port > 0 && (err = msetting_set_long(settings, MP_PORT,
port)))
+ break;
} while (0);
if (err) {
mapi_setError(mid, err, __func__, MERROR);
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
