From a46e450ce9b791b839d0c05b90924240354b1c35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ermal=20Lu=E7i?= <eri@pfsense.org>
Date: Mon, 8 Mar 2010 16:53:45 +0000
Subject: Do not spread checking for value accross code. Do it in the function
 that is supposed to do it.

---
 etc/inc/pfsense-utils.inc    | 14 ++++++++------
 etc/phpshellsessions/gitsync |  6 +-----
 etc/rc.bootup                |  6 +-----
 3 files changed, 10 insertions(+), 16 deletions(-)

(limited to 'etc')

diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index 4af5559..a80cbe9 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -1004,7 +1004,12 @@ function reload_all_sync() {
 	mwexec("/bin/rm {$g['tmp_path']}/reload*");
 }
 
-function auto_login($status) {
+function auto_login() {
+	global $config;
+
+	if(isset($config['system']['disableconsolemenu']))
+		return;
+		
 	$gettytab = file_get_contents("/etc/gettytab");
 	$getty_split = split("\n", $gettytab);
 	conf_mount_rw();
@@ -1087,11 +1092,8 @@ function setup_serial_port() {
 		}
 	}
 	fclose($fd);
-	if(isset($config['system']['disableconsolemenu'])) {
-		auto_login(false);
-	} else {
-		auto_login(true);
-	}
+	auto_login();
+
 	conf_mount_ro();
 	return;
 }
diff --git a/etc/phpshellsessions/gitsync b/etc/phpshellsessions/gitsync
index bd662ca..6491851 100644
--- a/etc/phpshellsessions/gitsync
+++ b/etc/phpshellsessions/gitsync
@@ -227,11 +227,7 @@ function post_cvssync_commands() {
 
 	/* lock down console if necessary */
 	echo "===> Locking down the console if needed...\n";
-	if(isset($config['system']['disableconsolemenu'])) {
-		auto_login(false);
-	} else {
-		auto_login(true);
-	}
+	auto_login();
 	
 	echo "===> Signaling PHP and Lighty restart...";
 	$fd = fopen("/tmp/restart_lighty", "w");
diff --git a/etc/rc.bootup b/etc/rc.bootup
index b2db5fb..a6ca3f9 100755
--- a/etc/rc.bootup
+++ b/etc/rc.bootup
@@ -313,11 +313,7 @@ services_snmpd_configure();
 system_set_harddisk_standby();
 
 /* lock down console if necessary */
-if(isset($config['system']['disableconsolemenu'])) {
-	auto_login(false);
-} else {
-	auto_login(true);
-}
+auto_login();
 
 /* Run a filter configure now that most all services have started */
 filter_configure_sync();
-- 
cgit v1.1