summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorYASUOKA Masahiko <yasuoka@cvs.openbsd.org>2016-03-08 02:05:01 +0000
committerYASUOKA Masahiko <yasuoka@cvs.openbsd.org>2016-03-08 02:05:01 +0000
commit797902474bfd63128e31f2e10c09bac9aacbe01d (patch)
treed3e99e21354d88295e1cb91353761c0645671c68 /usr.sbin
parentd3b2689d8aaa7a39eb688af53b648707608d13ec (diff)
Fix: "authconf.users_file_path" is a char[] but is checked as a char*.
Diff from Mathieu Papineau (via Claer)
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/npppd/npppd/npppd_auth.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/npppd/npppd/npppd_auth.c b/usr.sbin/npppd/npppd/npppd_auth.c
index 72955d35927..101f8cc9a7f 100644
--- a/usr.sbin/npppd/npppd/npppd_auth.c
+++ b/usr.sbin/npppd/npppd/npppd_auth.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: npppd_auth.c,v 1.17 2015/12/05 18:43:36 mmcc Exp $ */
+/* $OpenBSD: npppd_auth.c,v 1.18 2016/03/08 02:05:00 yasuoka Exp $ */
/*-
* Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -26,7 +26,7 @@
* SUCH DAMAGE.
*/
/**@file authentication realm */
-/* $Id: npppd_auth.c,v 1.17 2015/12/05 18:43:36 mmcc Exp $ */
+/* $Id: npppd_auth.c,v 1.18 2016/03/08 02:05:00 yasuoka Exp $ */
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/socket.h>
@@ -197,7 +197,7 @@ npppd_auth_reload(npppd_auth_base *base)
base->has_users_file = 0;
base->radius_ready = 0;
- if (auth->users_file_path != NULL) {
+ if (strlen(auth->users_file_path) > 0) {
strlcpy(base->users_file_path, auth->users_file_path,
sizeof(base->users_file_path));
base->has_users_file = 1;