tyler.durden
/
dgamelaunch
mirror of https://github.com/paxed/dgamelaunch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Kludge to detect 'maxusers = 0' and handle f_num > myconfig->max more smoothly 

git-svn-id: svn://katsu.triplehelix.org/dgamelaunch/trunk@205 db0b04b0-f4d1-0310-9a6d-de3e77497b0e
This commit is contained in:
Joshua Kwan 2004-02-01 08:20:28 +00:00
parent 8721002b54
commit b34e8a4af3
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config.y
View File

@ -156,7 +156,11 @@ KeyPair: KeyType '=' TYPE_VALUE {
} }
| KeyType '=' TYPE_NUMBER { | KeyType '=' TYPE_NUMBER {
if (!myconfig) if (!myconfig)
{
myconfig = calloc(1, sizeof(struct dg_config)); myconfig = calloc(1, sizeof(struct dg_config));
myconfig->shed_uid = (uid_t)-1;
myconfig->shed_gid = (gid_t)-1;
}
switch ($1) switch ($1)
{ {
@ -184,6 +188,7 @@ KeyPair: KeyType '=' TYPE_VALUE {
break; break;
case TYPE_MAX: case TYPE_MAX:
set_max = 1; /* XXX XXX */
myconfig->max = $3; myconfig->max = $3;
break; break;

6
dgamelaunch.c
View File

@ -109,6 +109,7 @@ struct dg_config defconfig = {
/* max = */ 64000 /* max = */ 64000
}; };
int set_max = 0; /* XXX */
int loggedin = 0; int loggedin = 0;
char rcfilename[80]; char rcfilename[80];
char *chosen_name; char *chosen_name;
@ -181,7 +182,7 @@ create_config ()
myconfig->shed_gid = defconfig.shed_gid; myconfig->shed_gid = defconfig.shed_gid;
} }
if (myconfig->max == -1) myconfig->max = defconfig.max; if (myconfig->max == 0 && !set_max) myconfig->max = defconfig.max;
if (!myconfig->banner) myconfig->banner = defconfig.banner; if (!myconfig->banner) myconfig->banner = defconfig.banner;
if (!myconfig->chroot) myconfig->chroot = defconfig.chroot; if (!myconfig->chroot) myconfig->chroot = defconfig.chroot;
if (!myconfig->nethack) myconfig->nethack = defconfig.nethack; if (!myconfig->nethack) myconfig->nethack = defconfig.nethack;
@ -1093,7 +1094,10 @@ readfile (int nolock)
f_num++; f_num++;
/* prevent a buffer overrun here */ /* prevent a buffer overrun here */
if (f_num > myconfig->max) if (f_num > myconfig->max)
{
fprintf(stderr,"ERROR: number of users in database exceeds maximum. Exiting.\n");
graceful_exit (109); graceful_exit (109);
}
} }
if (!nolock) if (!nolock)

1
dgamelaunch.h
View File

@ -60,6 +60,7 @@ extern struct dg_config *myconfig;
extern char *chosen_name; extern char *chosen_name;
extern int loggedin; extern int loggedin;
extern int silent; extern int silent;
extern int set_max;
/* dgamelaunch.c */ /* dgamelaunch.c */
extern void create_config(void); extern void create_config(void);