added support for IPv6 DNS configuration - #1722

1 files changed, 13 insertions, 8 deletions

diff --git a/src/firejail/profile.c b/src/firejail/profile.c
index 1a944beff..c14f2b1f3 100644
--- a/src/firejail/profile.c
+++ b/src/firejail/profile.c
@@ -668,20 +668,25 @@ int profile_check_line(char *ptr, int lineno, const char *fname) {
 
         // dns
         if (strncmp(ptr, "dns ", 4) == 0) {
-                uint32_t dns;
-                if (atoip(ptr + 4, &dns)) {
-                        fprintf(stderr, "Error: invalid DNS server IP address\n");
-                        return 1;
+
+                if (check_ip46_address(ptr + 4) == 0) {
+                        fprintf(stderr, "Error: invalid DNS server IPv4 or IPv6 address\n");
+                        exit(1);
                 }
+                char *dns = strdup(ptr + 4);
+                if (!dns)
+                        errExit("strdup");
 
-                if (cfg.dns1 == 0)
+                if (cfg.dns1 == NULL)
                         cfg.dns1 = dns;
-                else if (cfg.dns2 == 0)
+                else if (cfg.dns2 == NULL)
                         cfg.dns2 = dns;
-                else if (cfg.dns3 == 0)
+                else if (cfg.dns3 == NULL)
                         cfg.dns3 = dns;
+                else if (cfg.dns4 == NULL)
+                        cfg.dns4 = dns;
                 else {
-                        fprintf(stderr, "Error: up to 3 DNS servers can be specified\n");
+                        fprintf(stderr, "Error: up to 4 DNS servers can be specified\n");
                         return 1;
                 }
                 return 0;