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
- Document the new "/" modifier for -/+.
[rsync/rsync.git]
/
access.c
diff --git
a/access.c
b/access.c
index
9def1b2
..
f8dd593
100644
(file)
--- a/
access.c
+++ b/
access.c
@@
-67,7
+67,7
@@
static int match_address(char *addr, char *tok)
int gai;
int ret = 0;
int addrlen = 0;
int gai;
int ret = 0;
int addrlen = 0;
-#if
def
HAVE_STRTOL
+#if HAVE_STRTOL
long int bits;
#else
int bits;
long int bits;
#else
int bits;
@@
-88,7
+88,7
@@
static int match_address(char *addr, char *tok)
/* Fail quietly if tok is a hostname (not an address) */
if (strspn(tok, ".0123456789") != len
/* Fail quietly if tok is a hostname (not an address) */
if (strspn(tok, ".0123456789") != len
-#if
def
INET6
+#if INET6
&& strchr(tok, ':') == NULL
#endif
) {
&& strchr(tok, ':') == NULL
#endif
) {
@@
-133,7
+133,7
@@
static int match_address(char *addr, char *tok)
break;
break;
-#if
def
INET6
+#if INET6
case PF_INET6:
{
struct sockaddr_in6 *sin6a, *sin6t;
case PF_INET6:
{
struct sockaddr_in6 *sin6a, *sin6t;
@@
-146,7
+146,7
@@
static int match_address(char *addr, char *tok)
addrlen = 16;
addrlen = 16;
-#if
def
HAVE_SOCKADDR_IN6_SCOPE_ID
+#if HAVE_SOCKADDR_IN6_SCOPE_ID
if (sin6t->sin6_scope_id &&
sin6a->sin6_scope_id != sin6t->sin6_scope_id) {
ret = 0;
if (sin6t->sin6_scope_id &&
sin6a->sin6_scope_id != sin6t->sin6_scope_id) {
ret = 0;
@@
-166,13
+166,13
@@
static int match_address(char *addr, char *tok)
bits = -1;
if (p) {
if (inet_pton(resa->ai_addr->sa_family, p, mask) <= 0) {
bits = -1;
if (p) {
if (inet_pton(resa->ai_addr->sa_family, p, mask) <= 0) {
-#if
def
HAVE_STRTOL
+#if HAVE_STRTOL
char *ep = NULL;
#else
unsigned char *pp;
#endif
char *ep = NULL;
#else
unsigned char *pp;
#endif
-#if
def
HAVE_STRTOL
+#if HAVE_STRTOL
bits = strtol(p, &ep, 10);
if (!*p || *ep) {
rprintf(FLOG, "malformed mask in %s\n", tok);
bits = strtol(p, &ep, 10);
if (!*p || *ep) {
rprintf(FLOG, "malformed mask in %s\n", tok);