X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fclient%2Fmain.c;h=c1883b4f14bf86eb619e46edc9b2e52b0361a8bf;hb=2f6ba83a4dbe0c6c9cfdd991f0f72f2a4f018b27;hp=d7a8e49a0fe0ad091a0251f902703ecb49107a89;hpb=135e5ad4cc018ec05d1118e4d40be5c51db3f293;p=tpg%2Fopendispense2.git

diff --git a/src/client/main.c b/src/client/main.c
index d7a8e49..c1883b4 100644
--- a/src/client/main.c
+++ b/src/client/main.c
@@ -97,7 +97,7 @@ char	*trim(char *string);
 void	CompileRegex(regex_t *regex, const char *pattern, int flags);
 
 // === GLOBALS ===
-char	*gsDispenseServer = "heathred";
+char	*gsDispenseServer = "merlo.ucc.gu.uwa.edu.au";
  int	giDispensePort = 11020;
 
 tItem	*gaItems;
@@ -107,14 +107,19 @@ regex_t	gArrayRegex, gItemRegex, gSaltRegex, gUserInfoRegex, gUserItemIdentRegex
 
 char	*gsItemPattern;	//!< Item pattern
 char	*gsEffectiveUser;	//!< '-u' Dispense as another user
+
  int	giUIMode = UI_MODE_STANDARD;
  int	gbDryRun = 0;	//!< '-n' Read-only
+ int	gbDisallowSelectWithoutBalance = 1;	//!< Don't allow items to be hilighted if not affordable
+
  int	giMinimumBalance = INT_MIN;	//!< '-m' Minumum balance for `dispense acct`
  int	giMaximumBalance = INT_MAX;	//!< '-M' Maximum balance for `dispense acct`
-char	*gsUserName;	//!< User that dispense will happen as
+
+ char	*gsUserName;	//!< User that dispense will happen as
 char	*gsUserFlags;	//!< User's flag set
- int	giUserBalance=-1;	//!< User balance (set by Authenticate)
+ int	giUserBalance = -1;	//!< User balance (set by Authenticate)
  int	giDispenseCount = 1;	//!< Number of dispenses to do
+
 char	*gsTextArgs[MAX_TXT_ARGS];
  int	giTextArgc;
 
@@ -129,16 +134,18 @@ void ShowUsage(void)
 			"        Show interactive list\n"
 			"    dispense <name>|<index>|<itemid>\n"
 			"        Dispense named item (<name> matches if it is a unique prefix)\n"
+			"    dispense finger\n"
+			"        Show the finger output\n"
 			);
 	if( giTextArgc == 0 || strcmp(gsTextArgs[0], "give") == 0 )
 		printf(
-			"    dispense give <user> <ammount> \"<reason>\"\n"
+			"    dispense give <user> <amount> \"<reason>\"\n"
 			"        Give money to another user\n"
 			);
 	
 	if( giTextArgc == 0 || strcmp(gsTextArgs[0], "donate") == 0 )
 		printf(
-			"    dispense donate <ammount> \"<reason>\"\n"
+			"    dispense donate <amount> \"<reason>\"\n"
 			"        Donate to the club\n"
 			);
 	if( giTextArgc == 0 || strcmp(gsTextArgs[0], "iteminfo") == 0 )
@@ -146,21 +153,28 @@ void ShowUsage(void)
 			"    dispense iteminfo <itemid>\n"
 			"        Get the name and price for an item\n"
 			);
+//	if( giTextArgc == 0 || strcmp(gsTextArgs[0], "enumitems") == 0 )
+//		printf(
+//			"    dispense enumitems\n"
+//			"        List avaliable items\n"
+//			);
 	if( giTextArgc == 0 )
 		printf("  == Coke members == \n");
 	if( giTextArgc == 0 || strcmp(gsTextArgs[0], "acct") == 0 )
 		printf(
 			"    dispense acct [<user>]\n"
 			"        Show user balances\n"
-			"    dispense acct <user> [+-]<ammount> \"<reason>\"\n"
+			"    dispense acct <user> [+-]<amount> \"<reason>\"\n"
 			"        Alter a account value\n"
-			"    dispense acct <user> =<ammount> \"<reason>\"\n"
+			"    dispense acct <user> =<amount> \"<reason>\"\n"
 			"        Set an account balance\n"
 			);
 	if( giTextArgc == 0 || strcmp(gsTextArgs[0], "refund") == 0 )
 		printf(
 			"    dispense refund <user> <itemid> [<price>]\n"
 			"        Refund an item to a user (with optional price override)\n"
+			"        Item IDs can be seen in the cokelog (in the brackets after the item name)\n"
+			"        e.g. coke:6 for a coke, snack:33 for slot 33 of the snack machine\n"
 			);
 	if( giTextArgc == 0 || strcmp(gsTextArgs[0], "slot") == 0 )
 		printf(
@@ -318,6 +332,15 @@ int main(int argc, char *argv[])
 					ShowUsage();
 					return 0;
 				}
+				else if( strcmp(argv[i], "--dry-run") == 0 ) {
+					gbDryRun = 1;
+				}
+				else if( strcmp(argv[i], "--drinks-only") == 0 ) {
+					giUIMode = UI_MODE_DRINKSONLY;
+				}
+				else if( strcmp(argv[i], "--can-select-all") == 0 ) {
+					gbDisallowSelectWithoutBalance = 0;
+				}
 				else {
 					fprintf(stderr, "%s: Unknown switch '%s'\n", argv[0], argv[i]);
 					ShowUsage();
@@ -354,6 +377,41 @@ int main(int argc, char *argv[])
 	
 	}
 
+	//
+	// `dispense finger`
+	// -
+	if( strcmp(gsTextArgs[0], "finger") == 0 )
+	{
+		// Connect to server
+		sock = OpenConnection(gsDispenseServer, giDispensePort);
+		if( sock < 0 )	return RV_SOCKET_ERROR;
+
+		// Get items
+		PopulateItemList(sock);
+
+		printf("The UCC Coke machine.\n\n");
+
+		// Only get coke slot statuses
+		for( i = 0; i <= 6; i ++ )
+		{
+			const char *status;
+			switch(gaItems[i].Status)
+			{
+			case 0:	status = "Avail";	break;
+			case 1:	status = "Sold ";	break;
+			default:
+				status = "Error";
+				break;
+			}
+			printf("%i - %s %3i %s\n", gaItems[i].ID, status, gaItems[i].Price, gaItems[i].Desc);
+			
+		}
+
+		printf("\nMay your pink fish bing into the distance.\n");
+
+		return 0;
+	}
+
 	//
 	// `dispense acct`
 	// - 
@@ -814,10 +872,10 @@ int main(int argc, char *argv[])
 		if( j > 1 ) {
 			printf("%i items dispensed\n", j);
 		}
+		Dispense_ShowUser(sock, gsUserName);
 		close(sock);
-	}
 
-	Dispense_ShowUser(sock, gsUserName);
+	}
 
 	return ret;
 }
@@ -833,9 +891,9 @@ int ShowNCursesUI(void)
 	 int	ch;
 	 int	i, times;
 	 int	xBase, yBase;
-	const int	displayMinWidth = 40;
+	const int	displayMinWidth = 50;
 	char	*titleString = "Dispense";
-	 int	itemCount;
+	 int	items_in_view;
 	 int	maxItemIndex;
 	 int	itemBase = 0;
 	 int	currentItem;
@@ -846,7 +904,37 @@ int ShowNCursesUI(void)
 	struct passwd *pwd;
 	 
 	 int	height, width;
-	 
+	
+	void _ItemDown(void)
+	{
+		currentItem ++;
+		// Skip over spacers
+		while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 )
+			currentItem ++;
+		
+		if( currentItem >= maxItemIndex ) {
+			currentItem = 0;
+			// Skip over spacers
+			while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 )
+				currentItem ++;
+		}
+	}
+	
+	void _ItemUp(void)
+	{
+		currentItem --;
+		// Skip over spacers
+		while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 )
+			currentItem --;
+		
+		if( currentItem < 0 ) {
+			currentItem = maxItemIndex - 1;
+			// Skip over spacers
+			while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 )
+				currentItem --;
+		}
+	}
+
 	// Get Username
 	if( gsEffectiveUser )
 		username = gsEffectiveUser;
@@ -855,7 +943,7 @@ int ShowNCursesUI(void)
 		username = pwd->pw_name;
 	}
 	// Get balance
-	snprintf(balance_str, sizeof balance_str, "$%i.%02i", giUserBalance/100, abs(giUserBalance)%100);
+	snprintf(balance_str, sizeof(balance_str), "$%i.%02i", giUserBalance/100, abs(giUserBalance)%100);
 	
 	// Enter curses mode
 	initscr();
@@ -865,9 +953,9 @@ int ShowNCursesUI(void)
 	maxItemIndex = ShowItemAt(0, 0, 0, -1, 0);
 	// Get item count per screen
 	// - 6: randomly chosen (Need at least 3)
-	itemCount = LINES - 6;
-	if( itemCount > maxItemIndex )
-		itemCount = maxItemIndex;
+	items_in_view = LINES - 6;
+	if( items_in_view > maxItemIndex )
+		items_in_view = maxItemIndex;
 	// Get first index
 	currentItem = 0;
 	while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 )
@@ -875,7 +963,7 @@ int ShowNCursesUI(void)
 	
 	
 	// Get dimensions
-	height = itemCount + 3;
+	height = items_in_view + 3;
 	width = displayMinWidth;
 	
 	// Get positions
@@ -888,7 +976,7 @@ int ShowNCursesUI(void)
 		PrintAlign(yBase, xBase, width, "/", '-', titleString, '-', "\\");
 		
 		// Items
-		for( i = 0; i < itemCount; i ++ )
+		for( i = 0; i < items_in_view; i ++ )
 		{
 			 int	pos = 0;
 			
@@ -900,7 +988,7 @@ int ShowNCursesUI(void)
 			// Check for the '...' row
 			// - Oh god, magic numbers!
 			if( (i == 0 && itemBase > 0)
-			 || (i == itemCount - 1 && itemBase < maxItemIndex - itemCount) )
+			 || (i == items_in_view - 1 && itemBase < maxItemIndex - items_in_view) )
 			{
 				printw("     ...");	pos += 8;
 				times = (width - pos) - 1;
@@ -918,16 +1006,16 @@ int ShowNCursesUI(void)
 			}
 			
 			// Scrollbar (if needed)
-			if( maxItemIndex > itemCount ) {
+			if( maxItemIndex > items_in_view ) {
 				if( i == 0 ) {
 					addch('A');
 				}
-				else if( i == itemCount - 1 ) {
+				else if( i == items_in_view - 1 ) {
 					addch('V');
 				}
 				else {
-					 int	percentage = itemBase * 100 / (maxItemIndex-itemCount);
-					if( i-1 == percentage*(itemCount-3)/100 ) {
+					 int	percentage = itemBase * 100 / (maxItemIndex-items_in_view);
+					if( i-1 == percentage*(items_in_view-3)/100 ) {
 						addch('#');
 					}
 					else {
@@ -959,42 +1047,13 @@ int ShowNCursesUI(void)
 				
 				switch(ch)
 				{
-				case 'B':
-					currentItem ++;
-					// Skip over spacers
-					while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 )
-						currentItem ++;
-					
-					if( currentItem >= maxItemIndex ) {
-						currentItem = 0;
-						// Skip over spacers
-						while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 )
-							currentItem ++;
-					}
-					break;
-				case 'A':
-					currentItem --;
-					// Skip over spacers
-					while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 )
-						currentItem --;
-					
-					if( currentItem < 0 ) {
-						currentItem = maxItemIndex - 1;
-						// Skip over spacers
-						while( ShowItemAt(0, 0, 0, currentItem, 0) == -1 )
-							currentItem --;
-					}
-					break;
+				case 'B':	_ItemDown();	break;
+				case 'A':	_ItemUp();	break;
 				}
 			}
 			else {
 				
 			}
-			
-			if( itemCount > maxItemIndex && currentItem < itemBase + 2 && itemBase > 0 )
-				itemBase = currentItem - 2;
-			if( itemCount > maxItemIndex && currentItem > itemBase + itemCount - 2 && itemBase < maxItemIndex-1 )
-				itemBase = currentItem - itemCount + 2;
 		}
 		else {
 			switch(ch)
@@ -1002,6 +1061,10 @@ int ShowNCursesUI(void)
 			case '\n':
 				ret = ShowItemAt(0, 0, 0, currentItem, 0);
 				break;
+			case 'h':	break;
+			case 'j':	_ItemDown();	break;
+			case 'k':	_ItemUp();	break;
+			case 'l':	break;
 			case 0x1b:	// Escape
 			case 'q':
 				ret = -1;	// -1: Return with no dispense
@@ -1012,6 +1075,21 @@ int ShowNCursesUI(void)
 			if( ret != -2 )	break;
 		}
 		
+		// Scroll only if needed
+		if( items_in_view < maxItemIndex )
+		{
+			// - If the current item is above the second item shown, and we're not at the top
+			if( currentItem < itemBase + 2 && itemBase > 0 ) {
+				itemBase = currentItem - 2;
+				if(itemBase < 0)	itemBase = 0;
+			}
+			// - If the current item is below the second item show, and we're not at the bottom
+			if( currentItem > itemBase + items_in_view - 2 && itemBase + items_in_view < maxItemIndex ) {
+				itemBase = currentItem - items_in_view + 2;
+				if( itemBase > maxItemIndex - items_in_view )
+					itemBase = maxItemIndex - items_in_view;
+			}
+		}
 	}
 	
 	
@@ -1027,7 +1105,6 @@ int ShowNCursesUI(void)
  */
 int ShowItemAt(int Row, int Col, int Width, int Index, int bHilighted)
 {
-	 int	_x, _y, times;
 	char	*name = NULL;
 	 int	price = 0;
 	 int	status = -1;
@@ -1081,7 +1158,7 @@ int ShowItemAt(int Row, int Col, int Width, int Index, int bHilighted)
 	if( Width > 0 )
 	{
 		// 4 preceding, 5 price
-		int nameWidth = Width - 4 - 5;
+		int nameWidth = Width - 4 - snprintf(NULL, 0, " %4i", price);
 		move( Row, Col );
 		
 		if( Index >= 0 )
@@ -1107,25 +1184,16 @@ int ShowItemAt(int Row, int Col, int Width, int Index, int bHilighted)
 			
 			printw("%-*.*s", nameWidth, nameWidth, name);
 		
-//			getyx(stdscr, _y, _x);
-			// Assumes max 4 digit prices
-//			times = Width - 5 - (_x - Col);	// TODO: Better handling for large prices
-//			while(times--)	addch(' ');
-			
 			printw(" %4i", price);
 		}
 		else
 		{
-			printw("-- %s", name);
-			getyx(stdscr, _y, _x);
-			times = Width - 4 - (_x - Col);
-			while(times--)	addch(' ');
-			printw("    ");
+			printw("-- %-*.*s ", Width-4, Width-4, name);
 		}
 	}
 	
 	// If the item isn't availiable for sale, return -1 (so it's skipped)
-	if( status || price > giUserBalance )
+	if( status || (price > giUserBalance && gbDisallowSelectWithoutBalance) )
 		Index = -1;
 	
 	return Index;
@@ -1255,28 +1323,53 @@ int OpenConnection(const char *Host, int Port)
 	return sock;
 }
 
-/**
- * \brief Authenticate with the server
- * \return Boolean Failure
- */
-int Authenticate(int Socket)
+int Authenticate_AutoAuth(int Socket, const char *Username)
 {
-	struct passwd	*pwd;
 	char	*buf;
 	 int	responseCode;
-	#if ATTEMPT_PASSWORD_AUTH
-	char	salt[32];
-	 int	i;
-	regmatch_t	matches[4];
-	#endif
+	 int	ret = -1;
 	
-	if( gbIsAuthenticated )	return 0;
+	// Attempt automatic authentication
+	sendf(Socket, "AUTOAUTH %s\n", Username);
 	
-	// Get user name
-	pwd = getpwuid( getuid() );
+	// Check if it worked
+	buf = ReadLine(Socket);
+	
+	responseCode = atoi(buf);
+	switch( responseCode )
+	{
+	case 200:	// Autoauth succeeded, return
+		ret = 0;
+		break;
+	
+	case 401:	// Untrusted
+//		fprintf(stderr, "Untrusted host, AUTOAUTH unavaliable\n");
+		ret = RV_PERMISSIONS;
+		break;
+	case 404:	// Bad Username
+		fprintf(stderr, "Bad Username '%s'\n", Username);
+		ret = RV_INVALID_USER;
+		break;
+	
+	default:
+		fprintf(stderr, "Unkown response code %i from server\n", responseCode);
+		printf("%s\n", buf);
+		ret = RV_UNKNOWN_ERROR;
+		break;;
+	}
+	
+	free(buf);
+	return ret;
+}
+
+int Authenticate_AuthIdent(int Socket)
+{
+	char	*buf;
+	 int	responseCode;
+	 int	ret = -1;
 	
 	// Attempt automatic authentication
-	sendf(Socket, "AUTOAUTH %s\n", pwd->pw_name);
+	sendf(Socket, "AUTHIDENT\n");
 	
 	// Check if it worked
 	buf = ReadLine(Socket);
@@ -1285,98 +1378,131 @@ int Authenticate(int Socket)
 	switch( responseCode )
 	{
 	case 200:	// Autoauth succeeded, return
-		free(buf);
+		ret = 0;
 		break;
 	
-	case 401:	// Untrusted, attempt password authentication
-		free(buf);
+	case 401:	// Untrusted
+//		fprintf(stderr, "Untrusted host, AUTHIDENT unavaliable\n");
+		ret = RV_PERMISSIONS;
+		break;
+	
+	default:
+		fprintf(stderr, "Unkown response code %i from server\n", responseCode);
+		printf("%s\n", buf);
+		ret = RV_UNKNOWN_RESPONSE;
+		break;
+	}
+	
+	free(buf);
 
-		#if ATTEMPT_PASSWORD_AUTH	
-		sendf(Socket, "USER %s\n", pwd->pw_name);
-		printf("Using username %s\n", pwd->pw_name);
-		
-		buf = ReadLine(Socket);
-		
-		// TODO: Get Salt
-		// Expected format: 100 SALT <something> ...
-		// OR             : 100 User Set
-		RunRegex(&gSaltRegex, buf, 4, matches, "Malformed server response");
-		responseCode = atoi(buf);
-		if( responseCode != 100 ) {
-			fprintf(stderr, "Unknown repsonse code %i from server\n%s\n", responseCode, buf);
-			free(buf);
-			return RV_UNKNOWN_ERROR;	// ERROR
-		}
-		
-		// Check for salt
-		if( memcmp( buf+matches[2].rm_so, "SALT", matches[2].rm_eo - matches[2].rm_so) == 0) {
-			// Store it for later
-			memcpy( salt, buf + matches[3].rm_so, matches[3].rm_eo - matches[3].rm_so );
-			salt[ matches[3].rm_eo - matches[3].rm_so ] = 0;
-		}
+	return ret;
+}
+
+int Authenticate_Password(int Socket, const char *Username)
+{
+	#if USE_PASSWORD_AUTH
+	char	*buf;
+	 int	responseCode;	
+	char	salt[32];
+	 int	i;
+	regmatch_t	matches[4];
+
+	sendf(Socket, "USER %s\n", Username);
+	printf("Using username %s\n", Username);
+	
+	buf = ReadLine(Socket);
+	
+	// TODO: Get Salt
+	// Expected format: 100 SALT <something> ...
+	// OR             : 100 User Set
+	RunRegex(&gSaltRegex, buf, 4, matches, "Malformed server response");
+	responseCode = atoi(buf);
+	if( responseCode != 100 ) {
+		fprintf(stderr, "Unknown repsonse code %i from server\n%s\n", responseCode, buf);
 		free(buf);
+		return RV_UNKNOWN_ERROR;	// ERROR
+	}
+	
+	// Check for salt
+	if( memcmp( buf+matches[2].rm_so, "SALT", matches[2].rm_eo - matches[2].rm_so) == 0) {
+		// Store it for later
+		memcpy( salt, buf + matches[3].rm_so, matches[3].rm_eo - matches[3].rm_so );
+		salt[ matches[3].rm_eo - matches[3].rm_so ] = 0;
+	}
+	free(buf);
+	
+	// Give three attempts
+	for( i = 0; i < 3; i ++ )
+	{
+		 int	ofs = strlen(Username)+strlen(salt);
+		char	tmpBuf[42];
+		char	tmp[ofs+20];
+		char	*pass = getpass("Password: ");
+		uint8_t	h[20];
 		
-		// Give three attempts
-		for( i = 0; i < 3; i ++ )
-		{
-			 int	ofs = strlen(pwd->pw_name)+strlen(salt);
-			char	tmpBuf[42];
-			char	tmp[ofs+20];
-			char	*pass = getpass("Password: ");
-			uint8_t	h[20];
-			
-			// Create hash string
-			// <username><salt><hash>
-			strcpy(tmp, pwd->pw_name);
-			strcat(tmp, salt);
-			SHA1( (unsigned char*)pass, strlen(pass), h );
-			memcpy(tmp+ofs, h, 20);
-			
-			// Hash all that
-			SHA1( (unsigned char*)tmp, ofs+20, h );
-			sprintf(tmpBuf, "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
-				h[ 0], h[ 1], h[ 2], h[ 3], h[ 4], h[ 5], h[ 6], h[ 7], h[ 8], h[ 9],
-				h[10], h[11], h[12], h[13], h[14], h[15], h[16], h[17], h[18], h[19]
-				);
-		
-			// Send password
-			sendf(Socket, "PASS %s\n", tmpBuf);
-			buf = ReadLine(Socket);
-		
-			responseCode = atoi(buf);
-			// Auth OK?
-			if( responseCode == 200 )	break;
-			// Bad username/password
-			if( responseCode == 401 )	continue;
-			
-			fprintf(stderr, "Unknown repsonse code %i from server\n%s\n", responseCode, buf);
-			free(buf);
-			return RV_UNKNOWN_ERROR;
-		}
-		free(buf);
-		if( i == 3 )
-			return RV_INVALID_USER;	// 2 = Bad Password
+		// Create hash string
+		// <username><salt><hash>
+		strcpy(tmp, Username);
+		strcat(tmp, salt);
+		SHA1( (unsigned char*)pass, strlen(pass), h );
+		memcpy(tmp+ofs, h, 20);
 		
-		#else
-		fprintf(stderr, "Untrusted host, AUTOAUTH unavaliable\n");
-		return RV_INVALID_USER;
-		#endif
-		break;
+		// Hash all that
+		SHA1( (unsigned char*)tmp, ofs+20, h );
+		sprintf(tmpBuf, "%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x%02x",
+			h[ 0], h[ 1], h[ 2], h[ 3], h[ 4], h[ 5], h[ 6], h[ 7], h[ 8], h[ 9],
+			h[10], h[11], h[12], h[13], h[14], h[15], h[16], h[17], h[18], h[19]
+			);
 	
-	case 404:	// Bad Username
-		fprintf(stderr, "Bad Username '%s'\n", pwd->pw_name);
-		free(buf);
-		return RV_INVALID_USER;
+		// Send password
+		sendf(Socket, "PASS %s\n", tmpBuf);
+		buf = ReadLine(Socket);
 	
-	default:
-		fprintf(stderr, "Unkown response code %i from server\n", responseCode);
-		printf("%s\n", buf);
+		responseCode = atoi(buf);
+		// Auth OK?
+		if( responseCode == 200 )	break;
+		// Bad username/password
+		if( responseCode == 401 )	continue;
+		
+		fprintf(stderr, "Unknown repsonse code %i from server\n%s\n", responseCode, buf);
 		free(buf);
-		return RV_UNKNOWN_ERROR;
+		return -1;
 	}
+	free(buf);
+	if( i == 3 )
+		return RV_INVALID_USER;	// 2 = Bad Password
+
+	return 0;
+	#else
+	return RV_INVALID_USER;
+	#endif
+}
+
+/**
+ * \brief Authenticate with the server
+ * \return Boolean Failure
+ */
+int Authenticate(int Socket)
+{
+	struct passwd	*pwd;
+	
+	if( gbIsAuthenticated )	return 0;
 	
+	// Get user name
+	pwd = getpwuid( getuid() );
+
+	// Attempt AUTOAUTH
+	if( Authenticate_AutoAuth(Socket, pwd->pw_name) == 0 )
+		;
+	else if( Authenticate_AuthIdent(Socket) == 0 )
+		;
+	else if( Authenticate_Password(Socket, pwd->pw_name) == 0 )
+		return RV_INVALID_USER;
+
 	// Set effective user
 	if( gsEffectiveUser ) {
+		char	*buf;
+		 int	responseCode;
 		sendf(Socket, "SETEUSER %s\n", gsEffectiveUser);
 		
 		buf = ReadLine(Socket);
@@ -1694,7 +1820,7 @@ int Dispense_AlterBalance(int Socket, const char *Username, int Ammount, const c
 
 	// Sanity
 	if( Ammount == 0 ) {
-		printf("An ammount would be nice\n");
+		printf("An amount would be nice\n");
 		return RV_ARGUMENTS;
 	}
 	
@@ -2212,7 +2338,7 @@ char *ReadLine(int Socket)
 		}
 		else {
 			len = recv(Socket, buf+bufPos, BUFSIZ-1-bufPos, 0);
-			if( len < 0 ) {
+			if( len <= 0 ) {
 				free(ret);
 				return strdup("599 Client Connection Error\n");
 			}
@@ -2231,9 +2357,10 @@ char *ReadLine(int Socket)
 		if( newline ) {
 			 int	newLen = newline - (buf+bufPos) + 1;
 			bufValid = len - newLen;
-			bufPos += newLen;
+			len = newLen;
 		}
 		if( len + bufPos == BUFSIZ - 1 )	bufPos = 0;
+		else	bufPos += len;
 	}
 	
 	#if DEBUG_TRACE_SERVER