diff options
| author | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2012-02-20 09:54:52 +1100 |
|---|---|---|
| committer | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2012-02-20 09:54:52 +1100 |
| commit | 40906c0e7b702c037a3ea3f41d0b114476a302a9 (patch) | |
| tree | 7dd9ce3b2659253f58a12ceb05d32eb3dcbb548f /ctdb/common/ctdb_util.c | |
| parent | 1cfefb406f289a9d1d7601e4e4708725b4782ac4 (diff) | |
| parent | 64208e04a5767844eff9d05644020246be530f2e (diff) | |
| download | samba-40906c0e7b702c037a3ea3f41d0b114476a302a9.tar.gz samba-40906c0e7b702c037a3ea3f41d0b114476a302a9.tar.xz samba-40906c0e7b702c037a3ea3f41d0b114476a302a9.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/ctdb
(This used to be ctdb commit d3c54ae9cc83f74d15f40bbfff95404b270d2f80)
Diffstat (limited to 'ctdb/common/ctdb_util.c')
| -rw-r--r-- | ctdb/common/ctdb_util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ctdb/common/ctdb_util.c b/ctdb/common/ctdb_util.c index 1ff4c1f9aa..bb32b6a345 100644 --- a/ctdb/common/ctdb_util.c +++ b/ctdb/common/ctdb_util.c @@ -522,7 +522,7 @@ void ctdb_canonicalize_ip(const ctdb_sock_addr *ip, ctdb_sock_addr *cip) #endif cip->ip.sin_family = AF_INET; cip->ip.sin_port = ip->ip6.sin6_port; - memcpy(&cip->ip.sin_addr, &ip->ip6.sin6_addr.s6_addr32[3], 4); + memcpy(&cip->ip.sin_addr, &ip->ip6.sin6_addr.s6_addr[12], 4); } } |