summaryrefslogtreecommitdiffstats
path: root/source3/include
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2009-01-16 15:51:46 +0100
committerJelmer Vernooij <jelmer@samba.org>2009-01-16 15:51:46 +0100
commit0bb7ccd0b0d245f87aaab71f3deaee49df9c27c7 (patch)
tree9d144da5fa6999e1ec5675164fb386581071e807 /source3/include
parentf69ac1398770e4c8c211e083bcf526f9a9d99e4a (diff)
parentdc6edf1ab4ae8e3fb3ef40b93135ff0ef5407e12 (diff)
downloadsamba-0bb7ccd0b0d245f87aaab71f3deaee49df9c27c7.tar.gz
samba-0bb7ccd0b0d245f87aaab71f3deaee49df9c27c7.tar.xz
samba-0bb7ccd0b0d245f87aaab71f3deaee49df9c27c7.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/include')
-rw-r--r--source3/include/ctdbd_conn.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/include/ctdbd_conn.h b/source3/include/ctdbd_conn.h
index 44c35168a8..d721235336 100644
--- a/source3/include/ctdbd_conn.h
+++ b/source3/include/ctdbd_conn.h
@@ -57,8 +57,8 @@ NTSTATUS ctdbd_traverse(uint32 db_id,
void *private_data);
NTSTATUS ctdbd_register_ips(struct ctdbd_connection *conn,
- const struct sockaddr *server,
- const struct sockaddr *client,
+ const struct sockaddr_storage *server,
+ const struct sockaddr_storage *client,
void (*release_ip_handler)(const char *ip_addr,
void *private_data),
void *private_data);