Add stricter checks for netnames.

[oweals/tinc.git] / src / tincd.c

diff --git a/src/tincd.c b/src/tincd.c
index 3bc17e233fd34f69c77dc094f1c91499a0ccd938..72bd8f3134b65cf3baee793449b885bee866dab3 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -261,11 +261,14 @@ static bool parse_options(int argc, char **argv) {
                netname = NULL;
        }
 
-       if(netname && (strpbrk(netname, "\\/") || *netname == '.')) {
+       if(netname && !check_netname(netname, false)) {
                fprintf(stderr, "Invalid character in netname!\n");
                return false;
        }
 
+       if(netname && !check_netname(netname, true))
+               fprintf(stderr, "Warning: unsafe character in netname!\n");
+
        return true;
 }