Cleaned up stray log_enables() and misc readme instructions.

5 files changed, 4 insertions, 14 deletions

diff --git a/README.md b/README.md
index f3a7c709..b03707d2 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ vagrant init lavabit/magma; vagrant up --provider virtualbox
 vagrant init lavabit/magma; vagrant up --provider libvirt
 ```
 
-Images for specific platforms can be found [here](https://atlas.hashicorp.com/lavabit)
+Images are available for alternate platforms [here](https://atlas.hashicorp.com/lavabit).
 
 # Credits
 
@@ -84,8 +84,7 @@ These instructions are targeted at systems running CentOS 6.
 Install the dependencies (make sure that EPEL is enabled):
 
 ```shell
-yum groupinstall -y 'Development Tools'
-yum install -y mysql-server memcached gettext-devel patch ncurses-devel perl-Time-HiRes check check-devel libbsd-devel
+yum install -y  gcc make autoconf automake binutils bison flex gcc-c++ gettext libtool make patch pkgconfig mysql-server memcached gettext-devel patch perl perl-Time-HiRes check check-devel ncurses-devel libbsd-devel
 ```
 
 **MySQL**
@@ -93,8 +92,7 @@ yum install -y mysql-server memcached gettext-devel patch ncurses-devel perl-Tim
 To start MySQL and configure the magma username run the commands below. The supplied password should be replaced with value unique to your environment. You may also want to limit the permissions of the magma database user to the database it will need to access. The global permission is only needed to setup the table schema.
 
 ```shell
-service mysqld start
-chkconfig mysqld on
+chkconfig mysqld on && service mysqld start
 
 echo "CREATE USER 'magma'@'localhost' IDENTIFIED BY 'volcano';" | mysql -u root
 echo "GRANT ALL PRIVILEGES ON *.* TO 'magma'@'localhost' WITH GRANT OPTION;" | mysql -u root
@@ -105,8 +103,7 @@ echo "GRANT ALL PRIVILEGES ON *.* TO 'magma'@'localhost' WITH GRANT OPTION;" | m
 To start Memcached run the commands below.
 
 ```shell
-service memcached start
-chkconfig memcached on
+chkconfig memcached on && service memcached start
 ```
 ### Compiling (The Short Way)
 
diff --git a/check/magma/prime/primitives_check.c b/check/magma/prime/primitives_check.c
index f8f97b8e..ce41064a 100644
--- a/check/magma/prime/primitives_check.c
+++ b/check/magma/prime/primitives_check.c
@@ -62,7 +62,6 @@ bool_t check_prime_writers_sthread(stringer_t *errmsg) {
 
 bool_t check_prime_unpacker_sthread(stringer_t *errmsg) {
 
-	log_enable();
 	prime_object_t *object = NULL;
 	stringer_t *user_key = base64_decode(NULLER("B90AAEQBIAzFqb5wsMLLwJV1uUfVecHirAQVnHZbvlDqDqkwGZwzAiAk/epj8HtmvA/VUnMC9TfWwh1veCK9Bp+uExSfeuHCug=="), MANAGEDBUF(76)),
 		*org_key = base64_decode(NULLER("B6AAAEQBIJw2BXyqCKDFsosdWHuGxUpD7CDNyYCCjtjKuS1zHUOAAyD0I69V/DkTLv/g9Maesc9Vs2Ssef8ao4ZTzDk7e+Nf1g=="), MANAGEDBUF(128)),
diff --git a/check/magma/providers/provide_check.c b/check/magma/providers/provide_check.c
index baa4b8a9..9f52e5bd 100644
--- a/check/magma/providers/provide_check.c
+++ b/check/magma/providers/provide_check.c
@@ -572,14 +572,10 @@ START_TEST (check_unicode_s) {
 	bool_t result = true;
 	stringer_t *errmsg = MANAGEDBUF(1024);
 
-	log_disable();
-
 	if (status()) result = check_unicode_valid(errmsg);
 	if (status() && result) result = check_unicode_invalid(errmsg);
 	if (status() && result) result = check_unicode_length(errmsg);
 
-	log_enable();
-
 	log_test("PARSERS / UNICODE / SINGLE THREADED:", errmsg);
 	ck_assert_msg(result, st_char_get(errmsg));
 
diff --git a/check/magma/regression/regression_check_helpers.c b/check/magma/regression/regression_check_helpers.c
index f10bf193..1e1ff8da 100644
--- a/check/magma/regression/regression_check_helpers.c
+++ b/check/magma/regression/regression_check_helpers.c
@@ -142,7 +142,6 @@ bool_t check_regression_imap_search_range_parsing_sthread(stringer_t *errmsg, ui
 	//
 	// Attempted a token count on a NULL string bugger.
 	// Attempted token extraction from a NULL string buffer.
-	log_enable();
 
 	// Connect the client over TCP.
 	if (!(client = client_connect("localhost", port)) || client_read_line(client) <= 0 || !net_set_timeout(client->sockd, 20, 20)) {
diff --git a/check/magma/servers/smtp/smtp_check_network.c b/check/magma/servers/smtp/smtp_check_network.c
index c2ab9785..8ddbc159 100644
--- a/check/magma/servers/smtp/smtp_check_network.c
+++ b/check/magma/servers/smtp/smtp_check_network.c
@@ -282,7 +282,6 @@ bool_t check_smtp_network_auth_sthread(stringer_t *errmsg, uint32_t port, bool_t
 bool_t check_smtp_network_outbound_quota_sthread(stringer_t *errmsg, uint32_t port, bool_t secure) {
 
 	client_t *client = NULL;
-	log_enable();
 
 	// Wipe the Transmitting table history for the Magma user.
 	if (sql_query(PLACER("DELETE FROM Transmitting WHERE usernum = 1;", 45)) != 0) {