X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fclient%2Fmain.c;h=17971dc038dbc116247a60f7ccb5d0d092527f77;hb=36dc59549949567a7ed0113a6ad2e4cd90ae4975;hp=f433cae503a0dc1edb39bbfa2fcec1b93b475f1d;hpb=114f33e11226fbd4c2ad02a47829b4c44486efb5;p=tpg%2Fopendispense2.git

diff --git a/src/client/main.c b/src/client/main.c
index f433cae..17971dc 100644
--- a/src/client/main.c
+++ b/src/client/main.c
@@ -71,7 +71,7 @@ regex_t	gArrayRegex, gItemRegex, gSaltRegex, gUserInfoRegex;
  int	gbIsAuthenticated = 0;
 
 char	*gsItemPattern;	//!< Item pattern
-char	*gsOverrideUser;	//!< '-u' Dispense as another user
+char	*gsEffectiveUser;	//!< '-u' Dispense as another user
  int	gbUseNCurses = 0;	//!< '-G' Use the NCurses GUI?
  int	giMinimumBalance = INT_MIN;	//!< '-m' Minumum balance for `dispense acct`
  int	giMaximumBalance = INT_MAX;	//!< '-M' Maximum balance for `dispense acct`
@@ -115,7 +115,7 @@ int main(int argc, char *argv[])
 				break;
 			
 			case 'u':	// Override User
-				gsOverrideUser = argv[++i];
+				gsEffectiveUser = argv[++i];
 				break;
 			
 			case 'G':	// Use GUI
@@ -166,11 +166,18 @@ int main(int argc, char *argv[])
 				}
 			}
 			
+			// Show user information
 			Dispense_ShowUser(sock, argv[i+1]);
 			
 			close(sock);
 			return 0;
 		}
+		else if( strcmp(arg, "give") == 0 )
+		{
+			// TODO: `dispense give`
+			printf("TODO: Implement `dispense give`\n");
+			return 0;
+		}
 		else if( strcmp(arg, "user") == 0 )
 		{
 			// Check argument count
@@ -237,7 +244,9 @@ int main(int argc, char *argv[])
 	
 	if( gsItemPattern )
 	{
-		
+		// TODO: Implement `dispense <name>`
+		printf("TODO: Implement `dispense <name>`\n");
+		i = -1;
 	}
 	else if( gbUseNCurses )
 	{
@@ -295,7 +304,7 @@ void ShowUsage(void)
 		"        Give some of your money away\n"
 		"    dispense acct [<user>]\n"
 		"        Show user balances\n"
-		"    dispense acct <user> [+-=]<ammount> \"<reason>\"\n"
+		"    dispense acct <user> [+-]<ammount> \"<reason>\"\n"
 		"        Alter a account value (Coke members only)\n"
 		"    dispense user add <user>\n"
 		"        Create new coke account (Wheel members only)\n"
@@ -642,9 +651,8 @@ int Authenticate(int Socket)
 	{
 	
 	case 200:	// Authenticated, return :)
-		gbIsAuthenticated = 1;
 		free(buf);
-		return 0;
+		break;
 	
 	case 401:	// Untrusted, attempt password authentication
 		free(buf);
@@ -711,12 +719,9 @@ int Authenticate(int Socket)
 			return -1;
 		}
 		free(buf);
-		if( i < 3 ) {
-			gbIsAuthenticated = 1;
-			return 0;
-		}
-		else
+		if( i == 3 )
 			return 2;	// 2 = Bad Password
+		break;
 	
 	case 404:	// Bad Username
 		fprintf(stderr, "Bad Username '%s'\n", pwd->pw_name);
@@ -729,6 +734,43 @@ int Authenticate(int Socket)
 		free(buf);
 		return -1;
 	}
+	
+	// Set effective user
+	if( gsEffectiveUser ) {
+		sendf(Socket, "SETEUSER %s\n", gsEffectiveUser);
+		
+		buf = ReadLine(Socket);
+		responseCode = atoi(buf);
+		
+		switch(responseCode)
+		{
+		case 200:
+			printf("Running as '%s' by '%s'\n", gsEffectiveUser, pwd->pw_name);
+			break;
+		
+		case 403:
+			printf("Only coke members can use `dispense -u`\n");
+			free(buf);
+			return -1;
+		
+		case 404:
+			printf("Invalid user selected\n");
+			free(buf);
+			return -1;
+		
+		default:
+			fprintf(stderr, "Unkown response code %i from server\n", responseCode);
+			printf("%s\n", buf);
+			free(buf);
+			exit(-1);
+		}
+		
+		free(buf);
+	}
+	
+	gbIsAuthenticated = 1;
+	
+	return 0;
 }