From: Andrew Tridgell Date: Mon, 14 May 2007 03:48:14 +0000 (+1000) Subject: don't allow setrecmaster while not frozen X-Git-Tag: tevent-0.9.20~348^2~2736 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5d71cc78bb423b8457fcb7fdd229ef6ef6b061e5;p=thirdparty%2Fsamba.git don't allow setrecmaster while not frozen (This used to be ctdb commit e84b05ba6062ffc45b7f3c23e88feef1d39069c4) --- diff --git a/ctdb/common/ctdb_control.c b/ctdb/common/ctdb_control.c index 0ec0a384595..fab66c855af 100644 --- a/ctdb/common/ctdb_control.c +++ b/ctdb/common/ctdb_control.c @@ -123,8 +123,12 @@ static int32_t ctdb_control_dispatch(struct ctdb_context *ctdb, } case CTDB_CONTROL_SET_RECMASTER: { + CHECK_CONTROL_DATA_SIZE(sizeof(uint32_t)); + if (ctdb->freeze_mode != CTDB_FREEZE_FROZEN) { + DEBUG(0,("Attempt to set recmaster when not frozen\n")); + return -1; + } ctdb->recovery_master = ((uint32_t *)(&indata.dptr[0]))[0]; - return 0; }