Changeset: 20f63c2c6f10 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=20f63c2c6f10
Modified Files:
tools/merovingian/daemon/merovingian.c
Branch: Dec2011
Log Message:
merovingian: turn messages in warnings not to confuse people
diffs (19 lines):
diff --git a/tools/merovingian/daemon/merovingian.c
b/tools/merovingian/daemon/merovingian.c
--- a/tools/merovingian/daemon/merovingian.c
+++ b/tools/merovingian/daemon/merovingian.c
@@ -840,12 +840,12 @@ main(int argc, char *argv[])
if (kv->val != NULL) {
char *h = kv->val + 1;
if ((p = strchr(h, '}')) == NULL) {
- Mfprintf(stderr, "incompatible passphrase (not hashed
as "
- MONETDB5_PASSWDHASH ")\n");
+ Mfprintf(stderr, "warning: incompatible passphrase (not
hashed as "
+ MONETDB5_PASSWDHASH "), disabling
passphrase\n");
} else {
*p = '\0';
if (strcmp(h, MONETDB5_PASSWDHASH) != 0) {
- Mfprintf(stderr, "passphrase hash '%s'
incompatible, "
+ Mfprintf(stderr, "warning: passphrase hash '%s'
incompatible, "
"expected '%s', disabling
passphrase\n",
h, MONETDB5_PASSWDHASH);
} else {
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
