* CtdlHostAlias() now accepts "localhost" as a localhost address.

[citadel.git] / citadel / serv_network.c

diff --git a/citadel/serv_network.c b/citadel/serv_network.c
index c73aea9a7cae84a027a7b4000695a9a8a27f8393..79210e22efe575f65843d756744197f32482184e 100644 (file)
--- a/citadel/serv_network.c
+++ b/citadel/serv_network.c
@@ -1667,30 +1667,42 @@ void cmd_netp(char *cmdbuf)
 {
        char node[SIZ];
        char pass[SIZ];
+       int v;
 
        char secret[SIZ];
        char nexthop[SIZ];
 
        if (doing_queue) {
-               cprintf("%d spooling - try again in a few minutes\n", ERROR + RESOURCE_BUSY);
+               cprintf("%d spooling - try again in a few minutes\n",
+                       ERROR + RESOURCE_BUSY);
                return;
        }
 
+       /* Authenticate */
        extract(node, cmdbuf, 0);
        extract(pass, cmdbuf, 1);
 
-       if (is_valid_node(nexthop, secret, node) != 0) {
-               cprintf("%d authentication failed\n", ERROR + PASSWORD_REQUIRED);
+       /* Briefly load the IGnet Configuration to check node validity */
+       working_ignetcfg = CtdlGetSysConfig(IGNETCFG);
+       v = is_valid_node(nexthop, secret, node);
+       free(working_ignetcfg);
+       working_ignetcfg = NULL;
+
+       if (v != 0) {
+               cprintf("%d authentication failed\n",
+                       ERROR + PASSWORD_REQUIRED);
                return;
        }
 
        if (strcasecmp(pass, secret)) {
-               cprintf("%d authentication failed\n", ERROR + PASSWORD_REQUIRED);
+               cprintf("%d authentication failed\n",
+                       ERROR + PASSWORD_REQUIRED);
                return;
        }
 
        if (network_talking_to(node, NTT_CHECK)) {
-               cprintf("%d Already talking to %s right now\n", ERROR + RESOURCE_BUSY, node);
+               cprintf("%d Already talking to %s right now\n",
+                       ERROR + RESOURCE_BUSY, node);
                return;
        }