Remove uid_wrapper related code.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

6 files changed, 1 insertions, 51 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
diff --git a/nsswitch/libwbclient/wbc_pam.c b/nsswitch/libwbclient/wbc_pam.c
index f183cc61b1..51fc3bc5a2 100644
--- a/nsswitch/libwbclient/wbc_pam.c
+++ b/nsswitch/libwbclient/wbc_pam.c
@@ -23,7 +23,6 @@
 
 /* Required Headers */
 
-#define UID_WRAPPER_NOT_REPLACE
 #include "replace.h"
 #include "libwbclient.h"
 #include "../winbind_client.h"
diff --git a/nsswitch/pam_winbind.c b/nsswitch/pam_winbind.c
index 258e5ac2f7..a8883afd1d 100644
--- a/nsswitch/pam_winbind.c
+++ b/nsswitch/pam_winbind.c
@@ -10,8 +10,6 @@
    <sopwith@redhat.com> (see copyright below for full details)
 */
 
-#define UID_WRAPPER_NOT_REPLACE
-
 #include "pam_winbind.h"
 
 enum pam_winbind_request_type 
diff --git a/nsswitch/wb_common.c b/nsswitch/wb_common.c
index 5fde8d0f13..23b78874c1 100644
--- a/nsswitch/wb_common.c
+++ b/nsswitch/wb_common.c
@@ -22,8 +22,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#define UID_WRAPPER_NOT_REPLACE
-
 #include "replace.h"
 #include "system/select.h"
 #include "winbind_client.h"
diff --git a/source3/libsmb/smb_share_modes.c b/source3/libsmb/smb_share_modes.c
index c29721dd43..f2decc1779 100644
--- a/source3/libsmb/smb_share_modes.c
+++ b/source3/libsmb/smb_share_modes.c
@@ -24,7 +24,6 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#define UID_WRAPPER_NOT_REPLACE
 #include "includes.h"
 #include "system/filesys.h"
 #include "smb_share_modes.h"