X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=src%2Fserver%2Fserver.c;h=97800588ea3daf783f5474ee11bcab563f614d6f;hb=adaae4129acdd981ea7c2ae386d0ac41a93a4b7a;hp=63b4aa79777b27a04480e65aa9cda9cb9adf7251;hpb=5ea4314d1ee0769f8b521df2c81fe65f3a654959;p=tpg%2Fopendispense2.git

diff --git a/src/server/server.c b/src/server/server.c
index 63b4aa7..9780058 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -25,6 +25,8 @@
 #define	DEBUG_TRACE_CLIENT	0
 #define HACK_NO_REFUNDS	1
 
+#define PIDFILE	"/var/run/dispsrv.pid"
+
 // Statistics
 #define MAX_CONNECTION_QUEUE	5
 #define INPUT_BUFFER_SIZE	256
@@ -215,7 +217,7 @@ void Server_Start(void)
 	
 	// write pidfile
 	{
-		FILE *fp = fopen("/var/run/dispsrv.pid", "w");
+		FILE *fp = fopen(PIDFILE, "w");
 		if( fp ) {
 			fprintf(fp, "%i", getpid());
 			fclose(fp);
@@ -307,7 +309,7 @@ void Server_Cleanup(void)
 {
 	printf("\nClose(%i)\n", giServer_Socket);
 	close(giServer_Socket);
-	unlink("/var/run/dispsrv.pid");
+	unlink(PIDFILE);
 }
 
 /**
@@ -683,8 +685,7 @@ void Server_Cmd_SETEUSER(tClient *Client, char *Args)
 		sendf(Client->Socket, "404 User not found\n");
 		return ;
 	}
-	
-	// You can't be an internal account
+	// You can't be an internal account (unless you're an admin)
 	if( !(userFlags & USER_FLAG_ADMIN) )
 	{
 		eUserFlags = Bank_GetFlags(Client->EffectiveUID);
@@ -703,7 +704,7 @@ void Server_Cmd_SETEUSER(tClient *Client, char *Args)
 
 	// Disabled accounts
 	if( userFlags & USER_FLAG_DISABLED ) {
-		Client->UID = -1;
+		Client->EffectiveUID = -1;
 		sendf(Client->Socket, "403 Account disabled\n");
 		return ;
 	}