dsync-brain.c (dovecot-2.3.16) | : | dsync-brain.c (dovecot-2.3.17) | ||
---|---|---|---|---|
skipping to change at line 405 | skipping to change at line 405 | |||
(brain->mail_error == 0 ? MAIL_ERROR_TEMP : brain->mail_error); | (brain->mail_error == 0 ? MAIL_ERROR_TEMP : brain->mail_error); | |||
pool_unref(&brain->pool); | pool_unref(&brain->pool); | |||
return ret; | return ret; | |||
} | } | |||
static int | static int | |||
dsync_brain_lock(struct dsync_brain *brain, const char *remote_hostname) | dsync_brain_lock(struct dsync_brain *brain, const char *remote_hostname) | |||
{ | { | |||
const struct file_create_settings lock_set = { | const struct file_create_settings lock_set = { | |||
.lock_timeout_secs = brain->lock_timeout, | .lock_timeout_secs = brain->lock_timeout, | |||
.lock_method = FILE_LOCK_METHOD_FCNTL, | .lock_settings = { | |||
.lock_method = FILE_LOCK_METHOD_FCNTL, | ||||
}, | ||||
}; | }; | |||
const char *home, *error, *local_hostname = my_hostdomain(); | const char *home, *error, *local_hostname = my_hostdomain(); | |||
bool created; | bool created; | |||
int ret; | int ret; | |||
if ((ret = strcmp(remote_hostname, local_hostname)) < 0) { | if ((ret = strcmp(remote_hostname, local_hostname)) < 0) { | |||
/* locking done by remote */ | /* locking done by remote */ | |||
if (brain->debug) { | if (brain->debug) { | |||
i_debug("brain %c: Locking done by remote " | i_debug("brain %c: Locking done by remote " | |||
"(local hostname=%s, remote hostname=%s)", | "(local hostname=%s, remote hostname=%s)", | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 3 lines changed or added |