A small patch

[Mark Phalan]

Hi,

Here is a small patch to fix the memory leak in auth2 (as briefly
discussed on this list previously). 

Also I noticed a few more errors with coda-6.0.5.
In the vice-setup-rvm script the exec-prefix doesn't get set up properly
(I noticed this because I was installing coda into /opt and
vice-setup-rvm complained when it couldn't find codaconfedit).

Maybe line 47 should read:
---> [EMAIL PROTECTED]@


Also venus-setup complained when I ran it:

./venus-setup: line 156: syntax error near unexpected token `else'
./venus-setup: line 156: `    else'

I'm not sure how line 53 should read... maybe something like this?
---> if [ ! -x /dev/MAKEDEV ]; then


Cheers,

Mark.



diff -Naur coda-6.0.5.orig/coda-src/auth2/auth2.c coda-6.0.5/coda-src/auth2/auth2.c
--- coda-6.0.5.orig/coda-src/auth2/auth2.c	2003-11-21 22:49:55.000000000 +0100
+++ coda-6.0.5/coda-src/auth2/auth2.c	2004-03-26 14:22:28.351769920 +0100
@@ -87,6 +87,8 @@
 #include <codaconf.h>
 #include <vice_file.h>
 
+#define MAXNUMCLIENT 10
+
 static char *vicedir = NULL;
 
 extern int AL_DebugLevel;
@@ -116,6 +118,9 @@
 static int CheckOnly = 0;	/* only allow password checking at this server */
 static int DoRedirectLog = 1;	/* set to zero by -r switch on command line */
 
+struct UserInfo* client[MAXNUMCLIENT];
+int client_idx;
+
 void
 ReadConfigFile()
 {
@@ -175,6 +180,9 @@
 #endif
     
     LogMsg(-1, 0, stdout, "Server successfully started");
+	
+	client_idx=0;
+	memset(client,0,sizeof(client));
 
     while(TRUE) {
 	cid = 0;
@@ -334,6 +342,15 @@
 
 static void Terminate()
     {
+	int i;
+
+	for(i=0; i<client_idx; i++)
+		free(client[i]);
+
+	for(i=client_idx+1; i < MAXNUMCLIENT; i++)
+		if(client[i]!=0)
+			free(client[client_idx]);
+
     LogMsg(-1, 0, stdout, "Terminate signal received .......quitting");
     exit(0);
     }
@@ -482,18 +499,24 @@
 
 long S_AuthNewConn(RPC2_Handle cid, RPC2_Integer seType, RPC2_Integer secLevel, RPC2_Integer encType, RPC2_Integer AuthType, RPC2_CountedBS *cIdent)
     {
-    struct UserInfo *p;
     int vid;

     vid = GetViceId(cIdent);
     LogMsg(0, AuthDebugLevel, stdout, "AuthNewConn(0x%x, %d, %d, %d, %d)",
 	cid, seType, secLevel, encType, vid);
-    p = (struct UserInfo *) malloc(sizeof(struct UserInfo));
-    RPC2_SetPrivatePointer(cid, (char *)p);
-    p->ViceId = vid;
-    p->HasQuit = FALSE;
-    p->UserCPS = NULL;
-    p->LastUsed = time(0);
+    client[client_idx] = (struct UserInfo *) malloc(sizeof(struct UserInfo));
+
+    RPC2_SetPrivatePointer(cid, (char *)client[client_idx]);
+    client[client_idx]->ViceId = vid;
+    client[client_idx]->HasQuit = FALSE;
+    client[client_idx]->UserCPS = NULL;
+    client[client_idx]->LastUsed = time(0);
+
+	client_idx=(client_idx+1)%MAXNUMCLIENT;
+	if(client[client_idx]!=0){	
+		free(client[client_idx]);
+	}
+
     return(0);
     }