diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-10-27 19:22:37 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 2000-10-27 19:22:37 +0000 |
| commit | a295f28b67bbf66d29be3a811042ad0a3424835f (patch) | |
| tree | 18f3b7669fb3352235102734b93fb5f8b8fd4635 /sbin | |
| parent | 124515ec8cfcea8b9c399684daf28f82029b3b5f (diff) | |
conf.c: Merge with EOM 1.46
util.c: Merge EOM diff 1.20 - 1.21, i.e. 1.19 is still left to be merged
author: ho
Use stat(), not lstat().
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/isakmpd/conf.c | 6 | ||||
| -rw-r--r-- | sbin/isakmpd/util.c | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/sbin/isakmpd/conf.c b/sbin/isakmpd/conf.c index 8d8988f96c7..20a3967dd64 100644 --- a/sbin/isakmpd/conf.c +++ b/sbin/isakmpd/conf.c @@ -1,5 +1,5 @@ -/* $OpenBSD: conf.c,v 1.23 2000/10/26 22:28:16 niklas Exp $ */ -/* $EOM: conf.c,v 1.45 2000/10/24 13:29:15 niklas Exp $ */ +/* $OpenBSD: conf.c,v 1.24 2000/10/27 19:22:36 niklas Exp $ */ +/* $EOM: conf.c,v 1.46 2000/10/26 16:17:19 ho Exp $ */ /* * Copyright (c) 1998, 1999, 2000 Niklas Hallqvist. All rights reserved. @@ -510,7 +510,7 @@ conf_reinit (void) char *new_conf_addr = 0; struct stat sb; - if ((lstat (conf_path, &sb) == 0) || (errno != ENOENT)) + if ((stat (conf_path, &sb) == 0) || (errno != ENOENT)) { if (check_file_secrecy (conf_path, &sz)) return; diff --git a/sbin/isakmpd/util.c b/sbin/isakmpd/util.c index 0c4362a2aba..d2e50b84aa9 100644 --- a/sbin/isakmpd/util.c +++ b/sbin/isakmpd/util.c @@ -1,5 +1,5 @@ -/* $OpenBSD: util.c,v 1.9 2000/10/16 23:27:03 niklas Exp $ */ -/* $EOM: util.c,v 1.19 2000/10/14 23:40:08 angelos Exp $ */ +/* $OpenBSD: util.c,v 1.10 2000/10/27 19:22:36 niklas Exp $ */ +/* $Id: util.c,v 1.10 2000/10/27 19:22:36 niklas Exp $ */ /* * Copyright (c) 1998, 1999 Niklas Hallqvist. All rights reserved. @@ -226,9 +226,9 @@ check_file_secrecy (char *name, off_t *file_size) { struct stat st; - if (lstat (name, &st) == -1) + if (stat (name, &st) == -1) { - log_error ("check_file_secrecy: lstat (\"%s\") failed", name); + log_error ("check_file_secrecy: stat (\"%s\") failed", name); return -1; } if (st.st_uid != geteuid () && st.st_uid != getuid ()) |