[PATCH 1/2] advoptions-list: Add domain-search to options - bug#12819

[PATCH 1/2] advoptions-list: Add domain-search to options - bug#12819

[Adolf Belka]

[-- Attachment #1: Type: text/plain, Size: 683 bytes --]

Fixes: bug#12819
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 config/cfgroot/advoptions-list | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/cfgroot/advoptions-list b/config/cfgroot/advoptions-list
index 6330aefde..03d5a366c 100644
--- a/config/cfgroot/advoptions-list
+++ b/config/cfgroot/advoptions-list
@@ -7,6 +7,7 @@ option cookie-servers ip-address [, ip-address... ];
 option default-ip-ttl uint8;
 option default-tcp-ttl uint8;
 option dhcp-client-identifier data-string;
+option domain-search domain-list;
 option finger-server ip-address [, ip-address... ];
 option font-servers ip-address [, ip-address... ];
 option host-name string;
-- 
2.35.1

[PATCH 2/2] dhcp.cgi: Add domain-list type info in dhcp options - bug#12819

[Adolf Belka]

[-- Attachment #1: Type: text/plain, Size: 876 bytes --]

Fixes: bug#12819
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
 html/cgi-bin/dhcp.cgi | 1 +
 1 file changed, 1 insertion(+)

diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi
index 0a0a21d68..125713285 100644
--- a/html/cgi-bin/dhcp.cgi
+++ b/html/cgi-bin/dhcp.cgi
@@ -800,6 +800,7 @@ if ($dhcpsettings{'SUBMIT'} eq $Lang::tr{'dhcp advopt help'}) {
     print "<tr><td colspan='2'><hr /></td></tr>\n";
     print '<tr><td>string type</td><td>"quoted string" or 00:01:FF...</td></tr>';
     print '<tr><td>ip-address type </td><td>10.0.0.1 | www.dot.com</td></tr>';
+    print '<tr><td>domain-list type </td><td>"example.com", "eng.example.com", "sales.example.com"</td></tr>';
     print '<tr><td>int,uint types</td><td>numbers</td></tr>';
     print '<tr><td>flag type</td><td>on | off</td></tr>';
     print '</table>';
-- 
2.35.1

Re: [PATCH 1/2] advoptions-list: Add domain-search to options - bug#12819

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 853 bytes --]

Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>

> On 4 Apr 2022, at 12:49, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
> 
> Fixes: bug#12819
> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
> ---
> config/cfgroot/advoptions-list | 1 +
> 1 file changed, 1 insertion(+)
> 
> diff --git a/config/cfgroot/advoptions-list b/config/cfgroot/advoptions-list
> index 6330aefde..03d5a366c 100644
> --- a/config/cfgroot/advoptions-list
> +++ b/config/cfgroot/advoptions-list
> @@ -7,6 +7,7 @@ option cookie-servers ip-address [, ip-address... ];
> option default-ip-ttl uint8;
> option default-tcp-ttl uint8;
> option dhcp-client-identifier data-string;
> +option domain-search domain-list;
> option finger-server ip-address [, ip-address... ];
> option font-servers ip-address [, ip-address... ];
> option host-name string;
> -- 
> 2.35.1
> 

Re: [PATCH 2/2] dhcp.cgi: Add domain-list type info in dhcp options - bug#12819

[Michael Tremer]

[-- Attachment #1: Type: text/plain, Size: 1051 bytes --]

Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>

> On 4 Apr 2022, at 12:49, Adolf Belka <adolf.belka(a)ipfire.org> wrote:
> 
> Fixes: bug#12819
> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
> ---
> html/cgi-bin/dhcp.cgi | 1 +
> 1 file changed, 1 insertion(+)
> 
> diff --git a/html/cgi-bin/dhcp.cgi b/html/cgi-bin/dhcp.cgi
> index 0a0a21d68..125713285 100644
> --- a/html/cgi-bin/dhcp.cgi
> +++ b/html/cgi-bin/dhcp.cgi
> @@ -800,6 +800,7 @@ if ($dhcpsettings{'SUBMIT'} eq $Lang::tr{'dhcp advopt help'}) {
>     print "<tr><td colspan='2'><hr /></td></tr>\n";
>     print '<tr><td>string type</td><td>"quoted string" or 00:01:FF...</td></tr>';
>     print '<tr><td>ip-address type </td><td>10.0.0.1 | www.dot.com</td></tr>';
> +    print '<tr><td>domain-list type </td><td>"example.com", "eng.example.com", "sales.example.com"</td></tr>';
>     print '<tr><td>int,uint types</td><td>numbers</td></tr>';
>     print '<tr><td>flag type</td><td>on | off</td></tr>';
>     print '</table>';
> -- 
> 2.35.1
>