'screen' is only defined when AUTH_MAGIC_COOKIE is defined. Added missing

* gnuserv.c: (setup_table): 'screen' is only defined when AUTH_MAGIC_COOKIE
	is defined.
	Added missing initializers for popt options.
This commit is contained in:
Benoît Dejean
2004-09-19 12:08:55 +00:00
parent 3668b5bb19
commit 86fd7f23c4
2 changed files with 13 additions and 2 deletions

View File

@@ -1,3 +1,9 @@
2004-09-19 Benoît Dejean <tazforever@dlfp.org>
* gnuserv.c: (setup_table): 'screen' is only defined when AUTH_MAGIC_COOKIE
is defined.
Added missing initializers for popt options.
2004-05-25 Benoît Dejean <tazforever@dlfp.org>
* gnuserv.c: (permitted): Cast to size_t to remove warning.

View File

@@ -274,7 +274,12 @@ permitted (u_long host_addr, int fd)
static int
setup_table (void)
{
char hostname [HOSTNAMSZ], screen [BUFSIZ];
char hostname [HOSTNAMSZ];
#ifdef AUTH_MAGIC_COOKIE
char screen [BUFSIZ];
#endif
long host_addr;
int i, hosts = 0;
@@ -460,7 +465,7 @@ const struct poptOption popt_options [] = {
N_("Don't fork into background"), N_("NO-DAEMON") },
{ "inetd", 'i', POPT_ARG_NONE, &invoked_from_inetd, 0,
N_("Invoked from inetd"), N_("INETD") },
{ NULL, '\0', 0, NULL, 0 }
{ NULL, '\0', 0, NULL, 0, NULL, NULL }
};
int