X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Flogin_src%2Fmain.c;h=2866dbd68c51c2214bb75912e2a49e47a8521821;hb=45f9a29e481ce9ea7ca7121541f0e0f90147f5b1;hp=2e4906d109cccee90667bcab6a9e25aea3741f5b;hpb=ab47641a5334988563520c66f5097dd6d687ea48;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/login_src/main.c b/Usermode/Applications/login_src/main.c
index 2e4906d1..2866dbd6 100644
--- a/Usermode/Applications/login_src/main.c
+++ b/Usermode/Applications/login_src/main.c
@@ -22,12 +22,19 @@ int main(int argc, char *argv[])
 	{
 		printf("\x1B[2J");	// Clear Screen
 		// Validate User
-		do {
-			if(uid == -1)	printf("\n");
+		for(;;)
+		{
 			sUsername = GetUsername();
 			sPassword = GetPassword();
-			printf("\n");
-		} while( (uid = ValidateUser(sUsername, sPassword)) == -1 );
+			if( (uid = ValidateUser(sUsername, sPassword)) == -1 )
+			{
+				printf("\nInvalid username or password for '%s'\n", sUsername);
+				free(sUsername);
+				free(sPassword);
+			}
+			else
+				break;
+		}
 		printf("\n");
 		
 		// Create child process
@@ -50,7 +57,8 @@ int main(int argc, char *argv[])
 			child_argv[0] = uinfo->Shell;
 			// Set Environment
 			setgid(uinfo->GID);
-			setuid(uid);
+			//setuid(uid);
+			setuid(uinfo->UID);
 			
 			execve(uinfo->Shell, child_argv, child_envp);
 			exit(-1);
@@ -68,7 +76,7 @@ int main(int argc, char *argv[])
  */
 char *GetUsername()
 {
-	char	ret[BUFLEN];
+	char	ret[BUFLEN] = {0};
 	 int	pos = 0;
 	char	ch;