X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fserver.c;h=11846bb21fceb1836dba743e28f60e3bdfbddd76;hb=1fab0f284eb9f04b5a7b9e9c59baa306ae47f06b;hp=a48b69a993d259f87e9747755ec2bfc88a204559;hpb=ee724c0360fac7840d032812b5ab677aa0d15074;p=tpg%2Fopendispense2.git

diff --git a/src/server/server.c b/src/server/server.c
index a48b69a..11846bb 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "common.h"
+#include "../common/config.h"
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
@@ -28,9 +29,6 @@
 
 #define PIDFILE	"/var/run/dispsrv.pid"
 
-#define Debug_Notice(msg, v...)	printf("%08llun: "msg"\n", (unsigned long long)time(NULL) ,##v)
-#define Debug_Debug(msg, v...)	printf("%08llud: "msg"\n", (unsigned long long)time(NULL) ,##v)
-
 // Statistics
 #define MAX_CONNECTION_QUEUE	5
 #define INPUT_BUFFER_SIZE	256
@@ -1104,7 +1102,7 @@ void Server_Cmd_ADD(tClient *Client, char *Args)
 	if( !(Bank_GetFlags(Client->UID) & USER_FLAG_ADMIN) )
 	{
 		if( Bank_GetFlags(uid) & USER_FLAG_INTERNAL ) {
-			sendf(Client->Socket, "404 Invalid user\n");
+			sendf(Client->Socket, "403 Admin only\n");
 			return ;
 		}
 		// TODO: Maybe disallow changes to disabled?
@@ -1168,17 +1166,15 @@ void Server_Cmd_SET(tClient *Client, char *Args)
 		return ;
 	}
 
+	int origBalance, rv;
 	// Do give
-	switch( DispenseSet(Client->UID, uid, iAmmount, reason) )
+	switch( rv = DispenseSet(Client->UID, uid, iAmmount, reason, &origBalance) )
 	{
 	case 0:
-		sendf(Client->Socket, "200 Add OK\n");
-		return ;
-	case 2:
-		sendf(Client->Socket, "402 Poor Guy\n");
+		sendf(Client->Socket, "200 Add OK (%i)\n", origBalance);
 		return ;
 	default:
-		sendf(Client->Socket, "500 Unknown error\n");
+		sendf(Client->Socket, "500 Unknown error (%i)\n", rv);
 		return ;
 	}
 }