uranellus

diff -rub -x '*~' pfSense/etc/inc/services.inc pfSense-dhcp-ntp/etc/inc/services.inc
--- pfSense/etc/inc/services.inc	2007-04-09 02:01:57.000000000 +0200
+++ pfSense-dhcp-ntp/etc/inc/services.inc	2007-05-07 00:03:16.000000000 +0200
@@ -261,6 +261,9 @@
 			$dhcpdconf .= "	option netbios-node-type 8;\n";
 		}
 
+		if (is_array($dhcpifconf['ntpserver']) && $dhcpifconf['ntpserver'][0])
+			$dhcpdconf .= "	option ntp-servers " . join(",", $dhcpifconf['ntpserver']) . ";\n";
+
 		if(isset($dhcpifconf['netboot'])) {
 			if (($dhcpifconf['next-server'] <> "") && ($dhcpifconf['filename'] <> "")) {
 				$dhcpdconf .= "	next-server {$dhcpifconf['next-server']};\n";
diff -rub -x '*~' pfSense/usr/local/www/services_dhcp.php pfSense-dhcp-ntp/usr/local/www/services_dhcp.php
--- pfSense/usr/local/www/services_dhcp.php	2007-03-08 20:48:53.000000000 +0100
+++ pfSense-dhcp-ntp/usr/local/www/services_dhcp.php	2007-05-07 00:09:04.000000000 +0200
@@ -66,6 +66,7 @@
 $pconfig['maxtime'] = $config['dhcpd'][$if]['maxleasetime'];
 $pconfig['gateway'] = $config['dhcpd'][$if]['gateway'];
 list($pconfig['wins1'],$pconfig['wins2']) = $config['dhcpd'][$if]['winsserver'];
+list($pconfig['ntp1'],$pconfig['ntp2']) = $config['dhcpd'][$if]['ntpserver'];
 list($pconfig['dns1'],$pconfig['dns2']) = $config['dhcpd'][$if]['dnsserver'];
 $pconfig['enable'] = isset($config['dhcpd'][$if]['enable']);
 $pconfig['denyunknown'] = isset($config['dhcpd'][$if]['denyunknown']);
@@ -125,6 +126,9 @@
 		if (($_POST['wins1'] && !is_ipaddr($_POST['wins1'])) || ($_POST['wins2'] && !is_ipaddr($_POST['wins2']))) {
 			$input_errors[] = "A valid IP address must be specified for the primary/secondary WINS servers.";
 		}
+		if (($_POST['ntp1'] && !is_ipaddr($_POST['ntp2'])) || ($_POST['ntp2'] && !is_ipaddr($_POST['ntp2']))) {
+			$input_errors[] = "A valid IP address must be specified for the primary/secondary NTP servers.";
+		}
 		if (($_POST['dns1'] && !is_ipaddr($_POST['dns1'])) || ($_POST['dns2'] && !is_ipaddr($_POST['dns2']))) {
 			$input_errors[] = "A valid IP address must be specified for the primary/secondary DNS servers.";
 		}
@@ -179,6 +183,12 @@
 		if ($_POST['wins2'])
 			$config['dhcpd'][$if]['winsserver'][] = $_POST['wins2'];
 
+		unset($config['dhcpd'][$if]['ntpserver']);
+		if ($_POST['ntp1'])
+			$config['dhcpd'][$if]['ntpserver'][] = $_POST['ntp1'];
+		if ($_POST['ntp2'])
+			$config['dhcpd'][$if]['ntpserver'][] = $_POST['ntp2'];
+
 		unset($config['dhcpd'][$if]['dnsserver']);
 		if ($_POST['dns1'])
 			$config['dhcpd'][$if]['dnsserver'][] = $_POST['dns1'];
@@ -256,6 +266,8 @@
 	document.iform.range_to.disabled = endis;
 	document.iform.wins1.disabled = endis;
 	document.iform.wins2.disabled = endis;
+	document.iform.ntp1.disabled = endis;
+	document.iform.ntp2.disabled = endis;
 	document.iform.dns1.disabled = endis;
 	document.iform.dns2.disabled = endis;
 	document.iform.deftime.disabled = endis;
@@ -385,6 +397,13 @@
 			</td>
                       </tr>
                       <tr>
+                        <td width="22%" valign="top" class="vncell">NTP servers</td>
+                        <td width="78%" class="vtable">
+                          <input name="ntp1" type="text" class="formfld" id="ntp1" size="20" value="<?=htmlspecialchars($pconfig['ntp1']);?>"><br>
+                          <input name="ntp2" type="text" class="formfld" id="ntp2" size="20" value="<?=htmlspecialchars($pconfig['ntp2']);?>">
+			</td>
+                      </tr>
+                      <tr>
                         <td width="22%" valign="top" class="vncell">DNS servers</td>
                         <td width="78%" class="vtable">
                           <input name="dns1" type="text" class="formfld" id="dns1" size="20" value="<?=htmlspecialchars($pconfig['dns1']);?>"><br>