MonetDB: Apr2011 - monetdb: allow -h to be set without -P for un...

[Fabian Groffen]

Changeset: f1ae9cd2d202 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f1ae9cd2d202
Modified Files:
        tools/merovingian/client/monetdb.c
Branch: Apr2011
Log Message:

monetdb: allow -h to be set without -P for unix sockets


diffs (17 lines):

diff --git a/tools/merovingian/client/monetdb.c 
b/tools/merovingian/client/monetdb.c
--- a/tools/merovingian/client/monetdb.c
+++ b/tools/merovingian/client/monetdb.c
@@ -1434,10 +1434,10 @@
        }
 
        /* check consistency of -h -p and -P args */
-       if (mero_pass != NULL && mero_host == NULL) {
-               fprintf(stderr, "monetdb: -P requires -h to be used\n");
+       if (mero_pass != NULL && (mero_host == NULL || *mero_host == '/')) {
+               fprintf(stderr, "monetdb: -P requires -h to be used with a TCP 
hostname\n");
                exit(1);
-       } else if (mero_host != NULL && mero_pass == NULL) {
+       } else if (mero_host != NULL && *mero_host != '/' && mero_pass == NULL) 
{
                fprintf(stderr, "monetdb: -h requires -P to be used\n");
                exit(1);
        }
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list