Merge pull request #496 from waterkip/gh-477-logout_should_not_requir…

…e_a_login

Fix bug where logout requires login by @waterkip

cmd-logout.c

@@ -74,18 +74,18 @@ int cmd_logout(int argc, char **argv)
 	if (optind < argc)
 		die_usage(cmd_logout_usage);
 
-	if (!config_exists("verify"))
-		die("Not currently logged in.");
-
 	if (!force && !ask_yes_no(true, "Are you sure you would like to log out?")) {
 		terminal_printf(TERMINAL_FG_YELLOW TERMINAL_BOLD "Log out" TERMINAL_RESET ": aborted.\n");
 		return 1;
 	}
 
-	init_all(0, key, &session, NULL);
+	if (agent_ask(key)) {
+		init_all(0, key, &session, NULL);
+		lastpass_logout(session);
+	}
 
 	session_kill();
-	lastpass_logout(session);
+
 	terminal_printf(TERMINAL_FG_YELLOW TERMINAL_BOLD "Log out" TERMINAL_RESET ": complete.\n");
 	return 0;
 }

session.c

@@ -101,8 +101,11 @@ struct session *session_load(unsigned const char key[KDF_HASH_LEN])
 
 void session_kill()
 {
-	if (!config_unlink("verify") || !config_unlink("username") || !config_unlink("session_sessionid") || !config_unlink("iterations"))
-		die_errno("could not log out.");
+	config_unlink("verify");
+	config_unlink("username");
+	config_unlink("session_sessionid");
+	config_unlink("iterations");
+
 	config_unlink("blob");
 	config_unlink("session_token");
 	config_unlink("session_uid");