diff options
| author | Amitay Isaacs <amitay@gmail.com> | 2015-03-23 17:06:31 +1100 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2015-05-12 01:32:11 +0200 |
| commit | 9b6865475ed1a88885975f07c5848bfe003c7f5c (patch) | |
| tree | 808401f7ffdac6f99109e7d11fb165bd49fe47fb /ctdb/server/ctdb_control.c | |
| parent | 4f4e6ebace8ece37a90b08110a74b1a73030b28a (diff) | |
| download | samba-9b6865475ed1a88885975f07c5848bfe003c7f5c.tar.gz | |
ctdb-daemon: Remove obsolete IPv4 only controls
Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'ctdb/server/ctdb_control.c')
| -rw-r--r-- | ctdb/server/ctdb_control.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/ctdb/server/ctdb_control.c b/ctdb/server/ctdb_control.c index f3f70a38de5..9069087f1e1 100644 --- a/ctdb/server/ctdb_control.c +++ b/ctdb/server/ctdb_control.c @@ -164,7 +164,7 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb, return ctdb_control_getdbmap(ctdb, opcode, indata, outdata); case CTDB_CONTROL_GET_NODEMAPv4: - return ctdb_control_getnodemapv4(ctdb, opcode, indata, outdata); + return control_not_implemented("GET_NODEMAPv4", "GET_NODEMAP"); case CTDB_CONTROL_GET_NODEMAP: return ctdb_control_getnodemap(ctdb, opcode, indata, outdata); @@ -351,16 +351,14 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb, return 0; case CTDB_CONTROL_TAKEOVER_IPv4: - CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_public_ipv4)); - return ctdb_control_takeover_ipv4(ctdb, c, indata, async_reply); + return control_not_implemented("TAKEOVER_IPv4", "TAKEOVER_IP"); case CTDB_CONTROL_TAKEOVER_IP: CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_public_ip)); return ctdb_control_takeover_ip(ctdb, c, indata, async_reply); case CTDB_CONTROL_RELEASE_IPv4: - CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_public_ipv4)); - return ctdb_control_release_ipv4(ctdb, c, indata, async_reply); + return control_not_implemented("RELEASE_IPv4", "RELEASE_IP"); case CTDB_CONTROL_RELEASE_IP: CHECK_CONTROL_DATA_SIZE(sizeof(struct ctdb_public_ip)); @@ -371,8 +369,8 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb, return ctdb_control_ipreallocated(ctdb, c, async_reply); case CTDB_CONTROL_GET_PUBLIC_IPSv4: - CHECK_CONTROL_DATA_SIZE(0); - return ctdb_control_get_public_ipsv4(ctdb, c, outdata); + return control_not_implemented("GET_PUBLIC_IPSv4", + "GET_PUBLIC_IPS"); case CTDB_CONTROL_GET_PUBLIC_IPS: CHECK_CONTROL_DATA_SIZE(0); |