--- pathnames.h.orig	Tue Oct 14 03:09:53 2003
+++ pathnames.h	Sat Jul 10 21:04:34 2004
@@ -9,37 +9,37 @@
 
 #else /* HAVE_PATHS_H */
 #ifndef _PATH_VARRUN
-#define _PATH_VARRUN 	"/tmp/ppp/"
+#define _PATH_VARRUN 	"/var/run"
 #endif
 #define _PATH_DEVNULL	"/dev/null"
 #endif /* HAVE_PATHS_H */
 
 #ifndef _ROOT_PATH
-#define _ROOT_PATH
+#define _ROOT_PATH "/etc"
 #endif
 
-#define _PATH_UPAPFILE 	 _ROOT_PATH "/tmp/ppp/pap-secrets"
-#define _PATH_CHAPFILE 	 _ROOT_PATH "/tmp/ppp/chap-secrets"
-#define _PATH_SYSOPTIONS _ROOT_PATH "/tmp/ppp/options"
-#define _PATH_IPUP	 _ROOT_PATH "/tmp/ppp/ip-up"
-#define _PATH_IPDOWN	 _ROOT_PATH "/tmp/ppp/ip-down"
-#define _PATH_AUTHUP	 _ROOT_PATH "/tmp/ppp/auth-up"
-#define _PATH_AUTHDOWN	 _ROOT_PATH "/tmp/ppp/auth-down"
-#define _PATH_TTYOPT	 _ROOT_PATH "/tmp/ppp/options."
-#define _PATH_CONNERRS	 _ROOT_PATH "/tmp/ppp/connect-errors"
-#define _PATH_PEERFILES	 _ROOT_PATH "/tmp/ppp/peers/"
-#define _PATH_RESOLV	 _ROOT_PATH "/tmp/ppp/resolv.conf"
+#define _PATH_UPAPFILE 	 _ROOT_PATH "/ppp/pap-secrets"
+#define _PATH_CHAPFILE 	 _ROOT_PATH "/ppp/chap-secrets"
+#define _PATH_SYSOPTIONS _ROOT_PATH "/ppp/options"
+#define _PATH_IPUP	 _ROOT_PATH "/ppp/ip-up"
+#define _PATH_IPDOWN	 _ROOT_PATH "/ppp/ip-down"
+#define _PATH_AUTHUP	 _ROOT_PATH "/ppp/auth-up"
+#define _PATH_AUTHDOWN	 _ROOT_PATH "/ppp/auth-down"
+#define _PATH_TTYOPT	 _ROOT_PATH "/ppp/options."
+#define _PATH_CONNERRS	 "/tmp/connect-errors"
+#define _PATH_PEERFILES	 _ROOT_PATH "/ppp/peers/"
+#define _PATH_RESOLV	 "/tmp/resolv.conf"
 
 #define _PATH_USEROPT	 ".ppprc"
 
 #ifdef INET6
-#define _PATH_IPV6UP     _ROOT_PATH "/tmp/ppp/ipv6-up"
-#define _PATH_IPV6DOWN   _ROOT_PATH "/tmp/ppp/ipv6-down"
+#define _PATH_IPV6UP     _ROOT_PATH "/ppp/ipv6-up"
+#define _PATH_IPV6DOWN   _ROOT_PATH "/ppp/ipv6-down"
 #endif
 
 #ifdef IPX_CHANGE
-#define _PATH_IPXUP	 _ROOT_PATH "/tmp/ppp/ipx-up"
-#define _PATH_IPXDOWN	 _ROOT_PATH "/tmp/ppp/ipx-down"
+#define _PATH_IPXUP	 _ROOT_PATH "/ppp/ipx-up"
+#define _PATH_IPXDOWN	 _ROOT_PATH "/ppp/ipx-down"
 #endif /* IPX_CHANGE */
 
 #ifdef __STDC__
@@ -48,7 +48,7 @@
 #ifdef HAVE_PATHS_H
 #define _PATH_PPPDB	"/var/run/pppd.tdb"
 #else
-#define _PATH_PPPDB	"/tmp/ppp/pppd.tdb"
+#define _PATH_PPPDB	"/tmp/pppd.tdb"
 #endif
 #endif /* __STDC__ */