src/hg/instinct/webUserAdmin/webUserAdmin.c 1.13

Index: src/hg/instinct/webUserAdmin/webUserAdmin.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/instinct/webUserAdmin/webUserAdmin.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -b -B -U 4 -r1.12 -r1.13
--- src/hg/instinct/webUserAdmin/webUserAdmin.c	13 Jan 2010 01:16:16 -0000	1.12
+++ src/hg/instinct/webUserAdmin/webUserAdmin.c	8 Feb 2010 21:42:17 -0000	1.13
@@ -67,8 +67,10 @@
 
 bool checkPwd(char *password, char *encPassword)
 /* check an encrypted password */
 {
+if(!password || !encPassword)
+	return FALSE;
 char encPwd[35] = "";
 encryptPWD(password, encPassword, encPwd, sizeof(encPwd));
 if (sameString(encPassword,encPwd))
     {
@@ -532,9 +534,16 @@
     }
 
 safef(query,sizeof(query), "select password from webUsers where email='%s'", adminEmail);
 char *adminPassword = sqlQuickString(conn, query);
-if (!checkPwd(adminPasswordEntered, adminPassword))
+if(!adminPassword)
+	{
+    freez(&errMsg);
+    errMsg = cloneString("Unable to find admin email in database.");
+    activateWebUserPage(conn);
+    return;	
+	}
+else if (!checkPwd(adminPasswordEntered, adminPassword))
     {
     freez(&errMsg);
     errMsg = cloneString("Wrong admin password.");
     activateWebUserPage(conn);