MonetDB: Feb2013 - huphandler: make some noise if parsing passph...

[Fabian Groffen]

Changeset: 7576840f2a6c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7576840f2a6c
Modified Files:
        tools/merovingian/daemon/handlers.c
Branch: Feb2013
Log Message:

huphandler: make some noise if parsing passphrase fails


diffs (22 lines):

diff --git a/tools/merovingian/daemon/handlers.c 
b/tools/merovingian/daemon/handlers.c
--- a/tools/merovingian/daemon/handlers.c
+++ b/tools/merovingian/daemon/handlers.c
@@ -112,13 +112,16 @@ huphandler(int sig)
        if (kv->val != NULL) {
                char *h = kv->val + 1;
                if ((f = strchr(h, '}')) == NULL) {
+                       Mfprintf(stderr, "ignoring invalid passphrase: %s\n", 
kv->val);
                        setConfVal(kv, NULL);
                } else {
-                       *f = '\0';
+                       *f++ = '\0';
                        if (strcmp(h, MONETDB5_PASSWDHASH) != 0) {
+                               Mfprintf(stderr, "ignoring passphrase with 
incompatible "
+                                               "password hash: %s\n", h);
                                setConfVal(kv, NULL);
                        } else {
-                               setConfVal(kv, f + 1);
+                               setConfVal(kv, f);
                        }
                }
        }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list