Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Chown the $TO and $FROM directories to $RSYNCD_UID:$RSYNCD_GID (if we
[rsync/rsync.git]
/
rsync.h
diff --git
a/rsync.h
b/rsync.h
index
4ea7e0b
..
8592984
100644
(file)
--- a/
rsync.h
+++ b/
rsync.h
@@
-26,7
+26,8
@@
#define RSYNC_RSH_ENV "RSYNC_RSH"
#define RSYNC_NAME "rsync"
#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 DEFAULT_LOCK_FILE "/var/run/rsyncd.lock"
#define URL_PREFIX "rsync://"
@@
-330,6
+331,10
@@
enum logcode {FNONE=0, FERROR=1, FINFO=2, FLOG=3 };
#define INADDR_NONE 0xffffffff
#endif
#define INADDR_NONE 0xffffffff
#endif
+#ifndef IN_LOOPBACKNET
+#define IN_LOOPBACKNET 127
+#endif
+
struct file_struct {
unsigned flags;
time_t modtime;
struct file_struct {
unsigned flags;
time_t modtime;
@@
-614,7
+619,7
@@
inet_ntop(int af, const void *src, char *dst, size_t size);
#endif /* !HAVE_INET_NTOP */
#ifndef HAVE_INET_PTON
#endif /* !HAVE_INET_NTOP */
#ifndef HAVE_INET_PTON
-int i
sc_
net_pton(int af, const char *src, void *dst);
+int inet_pton(int af, const char *src, void *dst);
#endif
#ifdef MAINTAINER_MODE
#endif
#ifdef MAINTAINER_MODE
@@
-623,4
+628,4
@@
const char *get_panic_action(void);
#define UNUSED(x) x __attribute__((__unused__))
#define UNUSED(x) x __attribute__((__unused__))
-const char *io_write_phase, *io_read_phase;
+
extern
const char *io_write_phase, *io_read_phase;