summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2013-07-03 12:52:52 +0200
committerStefan Metzmacher <metze@samba.org>2014-04-17 14:56:05 +0200
commit751b2b2d2a8b66cd447b5aed4531a8fc6cfab256 (patch)
tree2064559f1e626e83a5855940bb6830a17b181dfc /lib
parent6d23354f72a487741177dd83c561a1bb72fa6412 (diff)
downloadsamba-751b2b2d2a8b66cd447b5aed4531a8fc6cfab256.tar.gz
samba-751b2b2d2a8b66cd447b5aed4531a8fc6cfab256.tar.xz
samba-751b2b2d2a8b66cd447b5aed4531a8fc6cfab256.zip
Remove uid_wrapper related code.
Signed-off-by: Andreas Schneider <asn@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/replace/wscript2
-rw-r--r--lib/util/setid.c44
2 files changed, 1 insertions, 45 deletions
diff --git a/lib/replace/wscript b/lib/replace/wscript
index 6a8ba1d270..f26ae943e2 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -617,7 +617,7 @@ def build(bld):
REPLACE_HOSTCC_SOURCE,
use_hostcc=True,
use_global_deps=False,
- cflags='-DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1 -DUID_WRAPPER_DISABLE=1 -D_SAMBA_HOSTCC_',
+ cflags='-DSOCKET_WRAPPER_DISABLE=1 -DNSS_WRAPPER_DISABLE=1 -D_SAMBA_HOSTCC_',
group='compiler_libraries',
deps = extra_libs
)
diff --git a/lib/util/setid.c b/lib/util/setid.c
index c5ee64484c..cdf8fd96d3 100644
--- a/lib/util/setid.c
+++ b/lib/util/setid.c
@@ -21,50 +21,6 @@
#include "replace.h"
#include "system/passwd.h"
-#ifdef UID_WRAPPER_REPLACE
-
-#ifdef samba_seteuid
-#undef samba_seteuid
-#endif
-
-#ifdef samba_setreuid
-#undef samba_setreuid
-#endif
-
-#ifdef samba_setresuid
-#undef samba_setresuid
-#endif
-
-#ifdef samba_setegid
-#undef samba_setegid
-#endif
-
-#ifdef samba_setregid
-#undef samba_setregid
-#endif
-
-#ifdef samba_setresgid
-#undef samba_setresgid
-#endif
-
-#ifdef samba_setgroups
-#undef samba_setgroups
-#endif
-
-/* uid_wrapper will have redefined these. */
-int samba_setresuid(uid_t ruid, uid_t euid, uid_t suid);
-int samba_setresgid(gid_t rgid, gid_t egid, gid_t sgid);
-int samba_setreuid(uid_t ruid, uid_t euid);
-int samba_setregid(gid_t rgid, gid_t egid);
-int samba_seteuid(uid_t euid);
-int samba_setegid(gid_t egid);
-int samba_setuid(uid_t uid);
-int samba_setgid(gid_t gid);
-int samba_setuidx(int flags, uid_t uid);
-int samba_setgidx(int flags, gid_t gid);
-int samba_setgroups(size_t setlen, const gid_t *gidset);
-#endif
-
#include "../lib/util/setid.h"
#else