diff options
| author | TW <tw@waldmann-edv.de> | 2018-07-05 23:15:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-05 23:15:51 +0200 |
| commit | e9321cc561b94699918d1e271c483db42effb0b2 (patch) | |
| tree | f7ce531d8b0f06d305f711a9eff5c941fb64fef8 | |
| parent | 65c5ae7e4910e5c4786fc32110761251969bd897 (diff) | |
| parent | 6754634ad753a84a8e56374a6417fc0eb378f2f5 (diff) | |
Merge pull request #3957 from ThomasWaldmann/fix-acl-proto-1.0
acl platform code: fix acl set return type (1.0-maint)
| -rw-r--r-- | borg/platform_darwin.pyx | 2 | ||||
| -rw-r--r-- | borg/platform_freebsd.pyx | 2 | ||||
| -rw-r--r-- | borg/platform_linux.pyx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/borg/platform_darwin.pyx b/borg/platform_darwin.pyx index e421ce289..c7643dc16 100644 --- a/borg/platform_darwin.pyx +++ b/borg/platform_darwin.pyx @@ -10,7 +10,7 @@ cdef extern from "sys/acl.h": int acl_free(void *obj) acl_t acl_get_link_np(const char *path, int type) - acl_t acl_set_link_np(const char *path, int type, acl_t acl) + int acl_set_link_np(const char *path, int type, acl_t acl) acl_t acl_from_text(const char *buf) char *acl_to_text(acl_t acl, ssize_t *len_p) int ACL_TYPE_EXTENDED diff --git a/borg/platform_freebsd.pyx b/borg/platform_freebsd.pyx index 27796c318..efdadf8c5 100644 --- a/borg/platform_freebsd.pyx +++ b/borg/platform_freebsd.pyx @@ -19,7 +19,7 @@ cdef extern from "sys/acl.h": int acl_free(void *obj) acl_t acl_get_link_np(const char *path, int type) - acl_t acl_set_link_np(const char *path, int type, acl_t acl) + int acl_set_link_np(const char *path, int type, acl_t acl) acl_t acl_from_text(const char *buf) char *acl_to_text_np(acl_t acl, ssize_t *len, int flags) int ACL_TEXT_NUMERIC_IDS diff --git a/borg/platform_linux.pyx b/borg/platform_linux.pyx index a1fe0e23e..17cbe8ad3 100644 --- a/borg/platform_linux.pyx +++ b/borg/platform_linux.pyx @@ -17,7 +17,7 @@ cdef extern from "sys/acl.h": int acl_free(void *obj) acl_t acl_get_file(const char *path, int type) - acl_t acl_set_file(const char *path, int type, acl_t acl) + int acl_set_file(const char *path, int type, acl_t acl) acl_t acl_from_text(const char *buf) char *acl_to_text(acl_t acl, ssize_t *len) |