Fix dhcp-parameter-request-list options concatenation

zentyal · Mar 27, 2018 · e8084f1 · e8084f1
1 parent 545e50a
commit e8084f1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/main/dhcp/ChangeLog b/main/dhcp/ChangeLog
@@ -1,3 +1,5 @@
+HEAD
+	+ Fix dhcp-parameter-request-list options concatenation
 5.1
 	+ Supress annoying vendor-class-identifier warnings in zentyal.log
 	+ Add TFTP functionality again

diff --git a/main/dhcp/stubs/dhcpd.conf.mas b/main/dhcp/stubs/dhcpd.conf.mas
@@ -86,6 +86,5 @@ include "<% $keysFile %>";
 
 # Add option 150 (0x96) and 155 (0x9b)
 if exists dhcp-parameter-request-list {
-option dhcp-parameter-request-list=concat(option dhcp-parameter-request-list,96);
-option dhcp-parameter-request-list=concat(option dhcp-parameter-request-list,9b);
+option dhcp-parameter-request-list=concat(option dhcp-parameter-request-list,96,9b);
 }