#define RSYNC_RSH_ENV "RSYNC_RSH"
#define RSYNC_NAME "rsync"
-#define RSYNCD_CONF "/etc/rsyncd.conf"
+#define RSYNCD_SYSCONF "/etc/rsyncd.conf"
+#define RSYNCD_USERCONF "rsyncd.conf"
#define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock"
#define URL_PREFIX "rsync://"
#define INADDR_NONE 0xffffffff
#endif
+#ifndef IN_LOOPBACKNET
+#define IN_LOOPBACKNET 127
+#endif
+
struct file_struct {
unsigned flags;
time_t modtime;
#endif /* !HAVE_INET_NTOP */
#ifndef HAVE_INET_PTON
-int isc_net_pton(int af, const char *src, void *dst);
+int inet_pton(int af, const char *src, void *dst);
#endif
#ifdef MAINTAINER_MODE
#define UNUSED(x) x __attribute__((__unused__))
-const char *io_write_phase, *io_read_phase;
+extern const char *io_write_phase, *io_read_phase;