X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Flogin_src%2Fmain.c;h=5ece35754a8f286c042882ce0fa6627a68644ebd;hb=8b0bac226378940df6cb56e5112b447570c3a39d;hp=54532837d5bbd17a4bb0b081c14357b0dd68c324;hpb=c13663104076a7780d1bbbaf77273416733cbb58;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/login_src/main.c b/Usermode/Applications/login_src/main.c
index 54532837..5ece3575 100644
--- a/Usermode/Applications/login_src/main.c
+++ b/Usermode/Applications/login_src/main.c
@@ -14,22 +14,30 @@ char	*GetPassword();
 int main(int argc, char *argv[])
 {
 	char	*sUsername, *sPassword;
-	 int	pid, uid;
+	 int	pid, uid = 0;
 	 int	status = 0;
 	tUserInfo	*uinfo;
-	
-	putchar('\n');
+
+	printf("\x1B[?25h");	// Re-enable the cursor	
+	printf("\x1B[2J");	// Clear Screen
+
 	for(;;)
 	{
 		// Validate User
-		do {
+		for(;;)
+		{
 			sUsername = GetUsername();
 			sPassword = GetPassword();
-		} while( (uid = ValidateUser(sUsername, sPassword)) == -1 );
-		putchar('\n');
-		
-		// Get user information
-		uinfo = GetUserInfo(uid);
+			if( (uid = ValidateUser(sUsername, sPassword)) == -1 )
+			{
+				printf("\nInvalid username or password\n");
+				free(sUsername);
+				free(sPassword);
+			}
+			else
+				break;
+		}
+		printf("\n");
 		
 		// Create child process
 		pid = clone(CLONE_VM, 0);
@@ -39,15 +47,24 @@ int main(int argc, char *argv[])
 			return -1;
 		}
 		
+		printf("pid = %i\n", pid);
+		
 		// Spawn shell in a child process
 		if(pid == 0)
 		{
-			char	*argv[2] = {uinfo->Shell, 0};
-			char	**envp = NULL;
+			char	*child_argv[2] = {NULL, 0};
+			char	**child_envp = NULL;
+			
+			// Get user information
+			uinfo = GetUserInfo(uid);
+			
+			child_argv[0] = uinfo->Shell;
+			// Set Environment
 			setgid(uinfo->GID);
-			setuid(uid);
+			//setuid(uid);
+			setuid(uinfo->UID);
 			
-			execve(uinfo->Shell, argv, envp);
+			execve(uinfo->Shell, child_argv, child_envp);
 			exit(-1);
 		}
 		
@@ -63,7 +80,7 @@ int main(int argc, char *argv[])
  */
 char *GetUsername()
 {
-	char	ret[BUFLEN];
+	char	ret[BUFLEN] = {0};
 	 int	pos = 0;
 	char	ch;
 	
@@ -74,6 +91,7 @@ char *GetUsername()
 	while( (ch = fgetc(stdin)) != -1 && ch != '\n' )
 	{
 		if(ch == '\b') {
+			if( pos <= 0 )	continue;
 			pos --;
 			ret[pos] = '\0';
 		}
@@ -109,6 +127,7 @@ char *GetPassword()
 	while( (ch = fgetc(stdin)) != -1 && ch != '\n' )
 	{
 		if(ch == '\b') {
+			if( pos <= 0 )	continue;
 			pos --;
 			ret[pos] = '\0';
 		}