From 324fa6c81a1626d766dcf21b7c4d117da73213b4 Mon Sep 17 00:00:00 2001
From: calzoneman <calzoneman@gmail.com>
Date: Tue, 8 Apr 2014 18:06:37 -0500
Subject: [PATCH] Fix a typo and an undefined variable case

---
 lib/io/ioserver.js | 2 +-
 lib/user.js        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/io/ioserver.js b/lib/io/ioserver.js
index 11c1dfe1..cf021e59 100644
--- a/lib/io/ioserver.js
+++ b/lib/io/ioserver.js
@@ -97,7 +97,7 @@ function handleConnection(sock) {
 
     Logger.syslog.log("Accepted socket from " + ip);
     var user = new User(sock);
-    if (sock.handshake.user) {
+    if (sock.handshake && sock.handshake.user) {
         user.name = sock.handshake.user.name;
         user.global_rank = sock.handshake.user.global_rank;
         user.loggedIn = true;
diff --git a/lib/user.js b/lib/user.js
index dc5d8030..ba8b7230 100644
--- a/lib/user.js
+++ b/lib/user.js
@@ -496,7 +496,7 @@ User.prototype.login = function (name, pw) {
         if (err) {
             if (err === "Invalid username/password combination") {
                 Logger.eventlog.log("[loginfail] Login failed (bad password): " + name
-                                  + "@" + user.ip);
+                                  + "@" + self.ip);
             }
 
             self.socket.emit("login", {