projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use functions from logger.c
[tinc]
/
src
/
conf.c
diff --git
a/src/conf.c
b/src/conf.c
index
b6d2b0a
..
f521152
100644
(file)
--- a/
src/conf.c
+++ b/
src/conf.c
@@
-19,31
+19,17
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: conf.c,v 1.9.4.6
5 2003/07/12 17:41:45
guus Exp $
+ $Id: conf.c,v 1.9.4.6
7 2003/07/18 14:10:27
guus Exp $
*/
*/
-#include "config.h"
-
-#include <ctype.h>
-#include <errno.h>
-#include <netdb.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <string.h>
-
-#include <xalloc.h>
-#include <utils.h> /* for cp */
-#include <avl_tree.h>
+#include "system.h"
+#include "avl_tree.h"
#include "conf.h"
#include "conf.h"
-#include "netutl.h" /* for str2address */
#include "logger.h"
#include "logger.h"
-
-#include "system.h"
+#include "netutl.h" /* for str2address */
+#include "utils.h" /* for cp */
+#include "xalloc.h"
avl_tree_t *config_tree;
avl_tree_t *config_tree;
@@
-431,6
+417,7
@@
int read_server_config()
int is_safe_path(const char *file)
{
int is_safe_path(const char *file)
{
+#if !(defined(HAVE_CYGWIN) || defined(HAVE_MINGW))
char *p;
const char *f;
char x;
char *p;
const char *f;
char x;
@@
-513,6
+500,7
@@
check2:
logger(LOG_ERR, _("`%s' has unsecure permissions"), f);
return 0;
}
logger(LOG_ERR, _("`%s' has unsecure permissions"), f);
return 0;
}
+#endif
return 1;
}
return 1;
}