sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-10 01:18:15 +03:00
Code

ctdb_mutex_ceph_rados_helper: revert strtoull_err() usage

Browse Source 
Compilation currently fails, as ctdb_mutex_ceph_rados_helper doesn't
include or link against the samba-util library. Revert back to the
previous strtoull() behaviour, which works fine.

Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Fri Mar  1 18:34:18 UTC 2019 on sn-devel-144
This commit is contained in:
David Disseldorp 2019-03-01 16:40:50 +01:00 committed by Jeremy Allison
parent 278eb236ae
commit e735160389
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ctdb/utils/ceph/ctdb_mutex_ceph_rados_helper.c
View File

@ -301,14 +301,10 @@ int main(int argc, char *argv[])
cmr_state->pool_name = argv[3];
cmr_state->object = argv[4];
if (argc == 6) {
int error = 0;
/* optional lock duration provided */
char *endptr = NULL;
cmr_state->lock_duration_s = strtoull_err(argv[5],
&endptr,
0,
&error);
if ((endptr == argv[5]) || (*endptr != '\0') || (error != 0)) {
cmr_state->lock_duration_s = strtoull(argv[5], &endptr, 0);
if ((endptr == argv[5]) || (*endptr != '\0')) {
fprintf(stdout, CTDB_MUTEX_STATUS_ERROR);
ret = -EINVAL;
goto err_ctx_cleanup;