diff options
author | Ralph Boehme <slow@samba.org> | 2018-06-28 14:28:34 +0200 |
---|---|---|
committer | Ralph Boehme <slow@samba.org> | 2018-07-24 17:38:28 +0200 |
commit | 0d2eeb9422bf3fb3097637c63d9e7c8bd20417af (patch) | |
tree | c563f4257e21e850ac00133fc45869dc2dd4701e | |
parent | fb6b6cf3e43165ced4b1039f2683d19f277c0792 (diff) | |
download | samba-0d2eeb9422bf3fb3097637c63d9e7c8bd20417af.tar.gz |
lib/util: rename USE_LINUX_THREAD_CREDENTIALS to HAVE_LINUX_THREAD_CREDENTIALS
The define reflects the results of a feature test, not a configure
option.
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
-rw-r--r-- | lib/util/setid.c | 24 | ||||
-rw-r--r-- | source3/lib/util_sec.c | 20 | ||||
-rw-r--r-- | source3/modules/vfs_aio_pthread.c | 4 | ||||
-rw-r--r-- | source3/wscript | 8 | ||||
-rw-r--r-- | tests/summary.c | 2 |
5 files changed, 29 insertions, 29 deletions
diff --git a/lib/util/setid.c b/lib/util/setid.c index 88195d8ee82..eb7511083f0 100644 --- a/lib/util/setid.c +++ b/lib/util/setid.c @@ -56,7 +56,7 @@ int samba_setgroups(size_t setlen, const gid_t *gidset); #endif -#if defined(USE_LINUX_THREAD_CREDENTIALS) +#if defined(HAVE_LINUX_THREAD_CREDENTIALS) #if defined(HAVE_UNISTD_H) #include <unistd.h> #endif @@ -80,7 +80,7 @@ int samba_setgroups(size_t setlen, const gid_t *gidset); /* All the setXX[ug]id functions and setgroups Samba uses. */ int samba_setresuid(uid_t ruid, uid_t euid, uid_t suid) { -#if defined(USE_LINUX_THREAD_CREDENTIALS) +#if defined(HAVE_LINUX_THREAD_CREDENTIALS) #if defined(USE_LINUX_32BIT_SYSCALLS) return syscall(SYS_setresuid32, ruid, euid, suid); #else @@ -96,7 +96,7 @@ int samba_setresuid(uid_t ruid, uid_t euid, uid_t suid) int samba_setresgid(gid_t rgid, gid_t egid, gid_t sgid) { -#if defined(USE_LINUX_THREAD_CREDENTIALS) +#if defined(HAVE_LINUX_THREAD_CREDENTIALS) #if defined(USE_LINUX_32BIT_SYSCALLS) return syscall(SYS_setresgid32, rgid, egid, sgid); #else @@ -112,7 +112,7 @@ int samba_setresgid(gid_t rgid, gid_t egid, gid_t sgid) int samba_setreuid(uid_t ruid, uid_t euid) { -#if defined(USE_LINUX_THREAD_CREDENTIALS) +#if defined(HAVE_LINUX_THREAD_CREDENTIALS) #if defined(USE_LINUX_32BIT_SYSCALLS) return syscall(SYS_setreuid32, ruid, euid); #else @@ -128,7 +128,7 @@ int samba_setreuid(uid_t ruid, uid_t euid) int samba_setregid(gid_t rgid, gid_t egid) { -#if defined(USE_LINUX_THREAD_CREDENTIALS) +#if defined(HAVE_LINUX_THREAD_CREDENTIALS) #if defined(USE_LINUX_32BIT_SYSCALLS) return syscall(SYS_setregid32, rgid, egid); #else @@ -144,7 +144,7 @@ int samba_setregid(gid_t rgid, gid_t egid) int samba_seteuid(uid_t euid) { -#if defined(USE_LINUX_THREAD_CREDENTIALS) +#if defined(HAVE_LINUX_THREAD_CREDENTIALS) #if defined(USE_LINUX_32BIT_SYSCALLS) /* seteuid is not a separate system call. */ return syscall(SYS_setresuid32, -1, euid, -1); @@ -162,7 +162,7 @@ int samba_seteuid(uid_t euid) int samba_setegid(gid_t egid) { -#if defined(USE_LINUX_THREAD_CREDENTIALS) +#if defined(HAVE_LINUX_THREAD_CREDENTIALS) #if defined(USE_LINUX_32BIT_SYSCALLS) /* setegid is not a separate system call. */ return syscall(SYS_setresgid32, -1, egid, -1); @@ -180,7 +180,7 @@ int samba_setegid(gid_t egid) int samba_setuid(uid_t uid) { -#if defined(USE_LINUX_THREAD_CREDENTIALS) +#if defined(HAVE_LINUX_THREAD_CREDENTIALS) #if defined(USE_LINUX_32BIT_SYSCALLS) return syscall(SYS_setuid32, uid); #else @@ -196,7 +196,7 @@ int samba_setuid(uid_t uid) int samba_setgid(gid_t gid) { -#if defined(USE_LINUX_THREAD_CREDENTIALS) +#if defined(HAVE_LINUX_THREAD_CREDENTIALS) #if defined(USE_LINUX_32BIT_SYSCALLS) return syscall(SYS_setgid32, gid); #else @@ -215,7 +215,7 @@ int samba_setuidx(int flags, uid_t uid) #if defined(HAVE_SETUIDX) return setuidx(flags, uid); #else - /* USE_LINUX_THREAD_CREDENTIALS doesn't have this. */ + /* HAVE_LINUX_THREAD_CREDENTIALS doesn't have this. */ errno = ENOSYS; return -1; #endif @@ -226,7 +226,7 @@ int samba_setgidx(int flags, gid_t gid) #if defined(HAVE_SETGIDX) return setgidx(flags, gid); #else - /* USE_LINUX_THREAD_CREDENTIALS doesn't have this. */ + /* HAVE_LINUX_THREAD_CREDENTIALS doesn't have this. */ errno = ENOSYS; return -1; #endif @@ -234,7 +234,7 @@ int samba_setgidx(int flags, gid_t gid) int samba_setgroups(size_t setlen, const gid_t *gidset) { -#if defined(USE_LINUX_THREAD_CREDENTIALS) +#if defined(HAVE_LINUX_THREAD_CREDENTIALS) #if defined(USE_LINUX_32BIT_SYSCALLS) return syscall(SYS_setgroups32, setlen, gidset); #else diff --git a/source3/lib/util_sec.c b/source3/lib/util_sec.c index 760f8b06906..a6817f6e3c4 100644 --- a/source3/lib/util_sec.c +++ b/source3/lib/util_sec.c @@ -165,7 +165,7 @@ static void assert_gid(gid_t rgid, gid_t egid) ****************************************************************************/ void gain_root_privilege(void) { -#if defined(USE_SETRESUID) || defined(USE_LINUX_THREAD_CREDENTIALS) +#if defined(USE_SETRESUID) || defined(HAVE_LINUX_THREAD_CREDENTIALS) samba_setresuid(0,0,0); #endif @@ -195,7 +195,7 @@ void gain_root_privilege(void) ****************************************************************************/ void gain_root_group_privilege(void) { -#if defined(USE_SETRESUID) || defined(USE_LINUX_THREAD_CREDENTIALS) +#if defined(USE_SETRESUID) || defined(HAVE_LINUX_THREAD_CREDENTIALS) samba_setresgid(0,0,0); #endif @@ -232,7 +232,7 @@ void gain_root_group_privilege(void) ****************************************************************************/ void set_effective_uid(uid_t uid) { -#if defined(USE_SETRESUID) || defined(USE_LINUX_THREAD_CREDENTIALS) +#if defined(USE_SETRESUID) || defined(HAVE_LINUX_THREAD_CREDENTIALS) /* Set the effective as well as the real uid. */ if (samba_setresuid(uid,uid,-1) == -1) { if (errno == EAGAIN) { @@ -264,7 +264,7 @@ void set_effective_uid(uid_t uid) ****************************************************************************/ void set_effective_gid(gid_t gid) { -#if defined(USE_SETRESUID) || defined(USE_LINUX_THREAD_CREDENTIALS) +#if defined(USE_SETRESUID) || defined(HAVE_LINUX_THREAD_CREDENTIALS) samba_setresgid(-1,gid,-1); #endif @@ -303,7 +303,7 @@ void save_re_uid(void) void restore_re_uid_fromroot(void) { -#if defined(USE_SETRESUID) || defined(USE_LINUX_THREAD_CREDENTIALS) +#if defined(USE_SETRESUID) || defined(HAVE_LINUX_THREAD_CREDENTIALS) samba_setresuid(saved_ruid, saved_euid, -1); #elif USE_SETREUID samba_setreuid(saved_ruid, -1); @@ -342,7 +342,7 @@ void save_re_gid(void) ****************************************************************************/ void restore_re_gid(void) { -#if defined(USE_SETRESUID) || defined(USE_LINUX_THREAD_CREDENTIALS) +#if defined(USE_SETRESUID) || defined(HAVE_LINUX_THREAD_CREDENTIALS) samba_setresgid(saved_rgid, saved_egid, -1); #elif USE_SETREUID samba_setregid(saved_rgid, -1); @@ -370,7 +370,7 @@ int set_re_uid(void) { uid_t uid = geteuid(); -#if defined(USE_SETRESUID) || defined(USE_LINUX_THREAD_CREDENTIALS) +#if defined(USE_SETRESUID) || defined(HAVE_LINUX_THREAD_CREDENTIALS) samba_setresuid(uid, uid, -1); #endif @@ -409,7 +409,7 @@ void become_user_permanently(uid_t uid, gid_t gid) gain_root_privilege(); gain_root_group_privilege(); -#if defined(USE_SETRESUID) || defined(USE_LINUX_THREAD_CREDENTIALS) +#if defined(USE_SETRESUID) || defined(HAVE_LINUX_THREAD_CREDENTIALS) samba_setresgid(gid,gid,gid); samba_setgid(gid); samba_setresuid(uid,uid,uid); @@ -454,7 +454,7 @@ int set_thread_credentials(uid_t uid, size_t setlen, const gid_t *gidset) { -#if defined(USE_LINUX_THREAD_CREDENTIALS) +#if defined(HAVE_LINUX_THREAD_CREDENTIALS) /* * With Linux thread-specific credentials * we know we have setresuid/setresgid @@ -501,7 +501,7 @@ static int have_syscall(void) { errno = 0; -#if defined(USE_SETRESUID) || defined(USE_LINUX_THREAD_CREDENTIALS) +#if defined(USE_SETRESUID) || defined(HAVE_LINUX_THREAD_CREDENTIALS) samba_setresuid(-1,-1,-1); #endif diff --git a/source3/modules/vfs_aio_pthread.c b/source3/modules/vfs_aio_pthread.c index a9e2b09827b..c1d1a7d518a 100644 --- a/source3/modules/vfs_aio_pthread.c +++ b/source3/modules/vfs_aio_pthread.c @@ -31,7 +31,7 @@ #include <linux/falloc.h> #endif -#if defined(HAVE_OPENAT) && defined(USE_LINUX_THREAD_CREDENTIALS) +#if defined(HAVE_OPENAT) && defined(HAVE_LINUX_THREAD_CREDENTIALS) /* * We must have openat() to do any thread-based @@ -395,7 +395,7 @@ static int aio_pthread_open_fn(vfs_handle_struct *handle, #endif static struct vfs_fn_pointers vfs_aio_pthread_fns = { -#if defined(HAVE_OPENAT) && defined(USE_LINUX_THREAD_CREDENTIALS) +#if defined(HAVE_OPENAT) && defined(HAVE_LINUX_THREAD_CREDENTIALS) .open_fn = aio_pthread_open_fn, #endif }; diff --git a/source3/wscript b/source3/wscript index a14d76d7469..8409e776dcc 100644 --- a/source3/wscript +++ b/source3/wscript @@ -964,23 +964,23 @@ syscall(SYS_setgroups32, 0, NULL); if (conf.CONFIG_SET('USE_LINUX_32BIT_SYSCALLS')): seteuid = conf.CHECK_CODE(''' #define AUTOCONF_TEST 1 - #define USE_LINUX_THREAD_CREDENTIALS 1 + #define HAVE_LINUX_THREAD_CREDENTIALS 1 #define USE_LINUX_32BIT_SYSCALLS 1 #include "../lib/util/setid.c" #include "./lib/util_sec.c" ''', - 'USE_LINUX_THREAD_CREDENTIALS', + 'HAVE_LINUX_THREAD_CREDENTIALS', addmain=False, execute=True, msg="Checking whether we can use Linux thread-specific credentials with 32-bit system calls") else: seteuid = conf.CHECK_CODE(''' #define AUTOCONF_TEST 1 - #define USE_LINUX_THREAD_CREDENTIALS 1 + #define HAVE_LINUX_THREAD_CREDENTIALS 1 #include "../lib/util/setid.c" #include "./lib/util_sec.c" ''', - 'USE_LINUX_THREAD_CREDENTIALS', + 'HAVE_LINUX_THREAD_CREDENTIALS', addmain=False, execute=True, msg="Checking whether we can use Linux thread-specific credentials") diff --git a/tests/summary.c b/tests/summary.c index 0843ee2cc91..87a64fd90ef 100644 --- a/tests/summary.c +++ b/tests/summary.c @@ -12,7 +12,7 @@ int main() #warning "WARNING: No automated network interface determination" #endif -#if !(defined(USE_SETEUID) || defined(USE_SETREUID) || defined(USE_SETRESUID) || defined(USE_SETUIDX) || defined(USE_LINUX_THREAD_CREDENTIALS)) +#if !(defined(USE_SETEUID) || defined(USE_SETREUID) || defined(USE_SETRESUID) || defined(USE_SETUIDX) || defined(HAVE_LINUX_THREAD_CREDENTIALS)) #error "ERROR: no seteuid method available" #endif |