Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* narrow-angle const spray

Browse Source 
* make config read return an error if it can't read the config file
This commit is contained in:
pooka 2007-07-02 16:33:05 +00:00
parent bc794f88ae
commit 6ff8a42783
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sbin/mount_portal/conf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: conf.c,v 1.11 2005/02/09 13:57:57 xtraeme Exp $ */
/* $NetBSD: conf.c,v 1.12 2007/07/02 16:33:05 pooka Exp $ */
/*
* Copyright (c) 1992, 1993
@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: conf.c,v 1.11 2005/02/09 13:57:57 xtraeme Exp $");
__RCSID("$NetBSD: conf.c,v 1.12 2007/07/02 16:33:05 pooka Exp $");
#endif /* not lint */
#include <sys/types.h>
@ -295,15 +295,21 @@ readfp(qelem *q0, FILE *fp, const char *conf_file)
* the existing path list with the new version.
* If the file is not readable, then no changes take place
*/
void
conf_read(qelem *q, char *conf)
int
conf_read(qelem *q, const char *conf)
{
FILE *fp = fopen(conf, "r");
int sverrno;
if (fp) {
readfp(q, fp, conf);
(void) fclose(fp);
} else
return 0;
} else {
sverrno = errno;
syslog(LOG_WARNING, "open config file \"%s\": %m", conf);
errno = sverrno;
return -1;
}
}

4
sbin/mount_portal/portald.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: portald.h,v 1.7 2005/02/09 13:57:57 xtraeme Exp $ */
/* $NetBSD: portald.h,v 1.8 2007/07/02 16:33:05 pooka Exp $ */
/*
* Copyright (c) 1992, 1993
@ -79,5 +79,5 @@ extern int portal_wfilter(struct portal_cred *,
*/
extern void activate(qelem *q, int so);
extern char **conf_match(qelem *q, char *key);
extern void conf_read(qelem *q, char *conf);
extern int conf_read(qelem *q, const char *conf);
extern int lose_credentials(struct portal_cred *);