From 04ad7c7c3fb4aa0eb9e85cc504941672cefcf1a1 Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Sat, 25 Dec 2004 04:13:45 +0000 Subject: Sync root password with admin password --- usr/local/www/system.php | 119 ++++++++++++++++++++++++----------------------- 1 file changed, 62 insertions(+), 57 deletions(-) (limited to 'usr') diff --git a/usr/local/www/system.php b/usr/local/www/system.php index bafb83d..c6cab0d 100755 --- a/usr/local/www/system.php +++ b/usr/local/www/system.php @@ -1,22 +1,22 @@ #!/usr/local/bin/php -. All rights reserved. - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE @@ -52,7 +52,7 @@ if (!$pconfig['timezone']) $pconfig['timezone'] = "Etc/UTC"; if (!$pconfig['timeservers']) $pconfig['timeservers'] = "pool.ntp.org"; - + function is_timezone($elt) { return !preg_match("/\/$/", $elt); } @@ -69,9 +69,9 @@ if ($_POST) { /* input validation */ $reqdfields = split(" ", "hostname domain username"); $reqdfieldsn = split(",", "Hostname,Domain,Username"); - + do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors); - + if ($_POST['hostname'] && !is_hostname($_POST['hostname'])) { $input_errors[] = "The hostname may only contain the characters a-z, 0-9 and '-'."; } @@ -84,14 +84,14 @@ if ($_POST) { if ($_POST['username'] && !preg_match("/^[a-zA-Z0-9]*$/", $_POST['username'])) { $input_errors[] = "The username may only contain the characters a-z, A-Z and 0-9."; } - if ($_POST['webguiport'] && (!is_numericint($_POST['webguiport']) || + if ($_POST['webguiport'] && (!is_numericint($_POST['webguiport']) || ($_POST['webguiport'] < 1) || ($_POST['webguiport'] > 65535))) { $input_errors[] = "A valid TCP/IP port must be specified for the webGUI port."; } if (($_POST['password']) && ($_POST['password'] != $_POST['password2'])) { $input_errors[] = "The passwords do not match."; } - + $t = (int)$_POST['timeupdateinterval']; if (($t < 0) || (($t > 0) && ($t < 6)) || ($t > 1440)) { $input_errors[] = "The time update interval must be either 0 (disabled) or between 6 and 1440."; @@ -113,26 +113,31 @@ if ($_POST) { $config['system']['timezone'] = $_POST['timezone']; $config['system']['timeservers'] = strtolower($_POST['timeservers']); $config['system']['time-update-interval'] = $_POST['timeupdateinterval']; - + unset($config['system']['dnsserver']); if ($_POST['dns1']) $config['system']['dnsserver'][] = $_POST['dns1']; if ($_POST['dns2']) $config['system']['dnsserver'][] = $_POST['dns2']; - + $olddnsallowoverride = $config['system']['dnsallowoverride']; $config['system']['dnsallowoverride'] = $_POST['dnsallowoverride'] ? true : false; - + if ($_POST['password']) { $config['system']['password'] = crypt($_POST['password']); + $fd = popen("/usr/sbin/pw usermod -n root -H 0", "w"); + $salt = md5(time()); + $crypted_pw = crypt($_POST['password'],$salt); + fwrite($fd, $crypted_pw); + pclose($fd); } - + write_config(); - + if (($oldwebguiproto != $config['system']['webgui']['protocol']) || ($oldwebguiport != $config['system']['webgui']['port'])) touch($d_sysrebootreqd_path); - + $retval = 0; if (!file_exists($d_sysrebootreqd_path)) { config_lock(); @@ -143,13 +148,13 @@ if ($_POST) { $retval |= services_dnsmasq_configure(); $retval |= system_timezone_configure(); $retval |= system_ntp_configure(); - + if ($olddnsallowoverride != $config['system']['dnsallowoverride']) $retval |= interfaces_wan_configure(); - + config_unlock(); } - + $savemsg = get_std_save_message($retval); } } @@ -169,93 +174,93 @@ if ($_POST) {
- + - - + - - + - - + - + - - + - + - - + - + - - + - - + -
Hostname -
name of the firewall host, without + 		+
name of the firewall host, without domain part
e.g. firewall
Domain +
e.g. mycorp.com
DNS servers

+



- IP addresses; these are also used for + IP addresses; these are also used for the DHCP service, DNS forwarder and for PPTP VPN clients

> - Allow DNS server list to be overridden by DHCP/PPP + Allow DNS server list to be overridden by DHCP/PPP on WAN
- If this option is set, m0n0wall will use DNS servers assigned - by a DHCP/PPP server on WAN for its own purposes (including - the DNS forwarder). They will not be assigned to DHCP and + If this option is set, m0n0wall will use DNS servers assigned + by a DHCP/PPP server on WAN for its own purposes (including + the DNS forwarder). They will not be assigned to DHCP and PPTP VPN clients, though.
Username
- If you want - to change the username for accessing the webGUI, enter it + If you want + to change the username for accessing the webGUI, enter it here.
Password -
-  (confirmation)
If you want - to change the password for accessing the webGUI, enter it + 		+
+  (confirmation)
If you want + to change the password for accessing the webGUI, enter it here twice.
webGUI protocol > HTTP     > HTTPS
webGUI port +
- Enter a custom port number for the webGUI - above if you want to override the default (80 for HTTP, 443 + Enter a custom port number for the webGUI + above if you want to override the default (80 for HTTP, 443 for HTTPS).
Time zone
Select the location closest +
Select the location closest to you
Time update interval -
Minutes between network time sync.; + 		+
Minutes between network time sync.; 300 recommended, or 0 to disable
NTP time server -
Use a space to separate multiple - hosts (only one required). Remember to set up at least one + 		+
Use a space to separate multiple + hosts (only one required). Remember to set up at least one DNS server if you enter a host name here!
  +
-- cgit v1.1