diff options
| author | Ronnie Sahlberg <sahlberg@ronnie> | 2007-10-18 15:53:50 +1000 |
|---|---|---|
| committer | Ronnie Sahlberg <sahlberg@ronnie> | 2007-10-18 15:53:50 +1000 |
| commit | 06cdb1ff3113ec69eecf3340c8539bc1e85fe279 (patch) | |
| tree | 638d6f33db617feb4e5b1bc9a3730490402d72d9 /ctdb | |
| parent | e4ec6e9d6b7ff7bfcabdba6825bb650e80652f40 (diff) | |
| parent | 5e3d5b1314336c78e9508901e42fc2f5cd858a4f (diff) | |
| download | samba-06cdb1ff3113ec69eecf3340c8539bc1e85fe279.tar.gz samba-06cdb1ff3113ec69eecf3340c8539bc1e85fe279.tar.xz samba-06cdb1ff3113ec69eecf3340c8539bc1e85fe279.zip | |
merge from tridge
(This used to be ctdb commit ad03e63906270c9c076ffdb1f62f912bb414ea10)
Diffstat (limited to 'ctdb')
| -rw-r--r-- | ctdb/server/ctdb_recover.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ctdb/server/ctdb_recover.c b/ctdb/server/ctdb_recover.c index 03e1db3f95..644f0b3c9c 100644 --- a/ctdb/server/ctdb_recover.c +++ b/ctdb/server/ctdb_recover.c @@ -459,7 +459,7 @@ static void set_recmode_handler(struct event_context *ev, struct fd_event *fde, { struct ctdb_set_recmode_state *state= talloc_get_type(private_data, struct ctdb_set_recmode_state); - char c; + char c = 0; int ret; /* we got a response from our child process so we can abort the @@ -476,8 +476,8 @@ static void set_recmode_handler(struct event_context *ev, struct fd_event *fde, the file which at this time SHOULD be locked by the recovery daemon on the recmaster */ - read(state->fd[0], &c, 1); - if (c != 0) { + ret = read(state->fd[0], &c, 1); + if (ret != 1 || c != 0) { ctdb_request_control_reply(state->ctdb, state->c, NULL, -1, "managed to lock reclock file from inside daemon"); talloc_free(state); return; |