s4:UID wrapper - Fix includes

The includes of the UID wrapper headers werent't really efficient according
to metze's post on the technical mailing list (http://lists.samba.org/archive/samba-technical/2010-February/069165.html).
To achieve this move the "uid_wrapper.h" includes into "lib/util/unix_privs.c",
 "lib/util/util.c", "ntvfs/posix/pvfs_acl.c" and "ntvfs/unixuid/vfs_unixuid.c".

diff --git a/lib/util/unix_privs.c b/lib/util/unix_privs.c
index f55e739a9bbaa18e2e5ef07dcfceff1048645e6b..b30b2f5163c04d7d091619a1b6812f742d8adfa7 100644 (file)
--- a/lib/util/unix_privs.c
+++ b/lib/util/unix_privs.c
@@ -20,9 +20,18 @@
 */
 
 #include "includes.h"
 */
 
 #include "includes.h"

-#include "system/filesys.h"
+#include "system/passwd.h"

 #include "../lib/util/unix_privs.h"
 
 #include "../lib/util/unix_privs.h"
 

+#if defined(UID_WRAPPER)
+#if !defined(UID_WRAPPER_REPLACE) && !defined(UID_WRAPPER_NOT_REPLACE)
+#define UID_WRAPPER_REPLACE
+#include "../uid_wrapper/uid_wrapper.h"
+#endif
+#else
+#define uwrap_enabled() 0
+#endif
+

 /**
  * @file
  * @brief Gaining/losing root privileges
 /**
  * @file
  * @brief Gaining/losing root privileges

diff --git a/lib/util/util.c b/lib/util/util.c
index 67b166b4212f01d85be7c61c9c9d7c78b8a91fbd..25e010830ec15797e20494a880c9023e2848b4ff 100644 (file)
--- a/lib/util/util.c
+++ b/lib/util/util.c
@@ -31,6 +31,15 @@
 #undef strdup
 #undef realloc
 
 #undef strdup
 #undef realloc
 

+#if defined(UID_WRAPPER)
+#if !defined(UID_WRAPPER_REPLACE) && !defined(UID_WRAPPER_NOT_REPLACE)
+#define UID_WRAPPER_REPLACE
+#include "../uid_wrapper/uid_wrapper.h"
+#endif
+#else
+#define uwrap_enabled() 0
+#endif
+

 /**
  * @file
  * @brief Misc utility functions
 /**
  * @file
  * @brief Misc utility functions

diff --git a/source4/heimdal_build/config.h b/source4/heimdal_build/config.h
index 8e9501b23b558b5f09301c62b85d03fb42caee59..be544cb83bb753da496f379b61b0dbf61e2ea90c 100644 (file)
--- a/source4/heimdal_build/config.h
+++ b/source4/heimdal_build/config.h
@@ -27,15 +27,6 @@
 
 #undef HAVE_KRB5_ENCRYPT_BLOCK
 
 
 #undef HAVE_KRB5_ENCRYPT_BLOCK
 

-#if defined(UID_WRAPPER)
-#if !defined(UID_WRAPPER_REPLACE) && !defined(UID_WRAPPER_NOT_REPLACE)
-#define UID_WRAPPER_REPLACE
-#include "../uid_wrapper/uid_wrapper.h"
-#endif
-#else
-#define uwrap_enabled() 0
-#endif
-

 /*Workaround for heimdal define vs samba define*/
 #ifdef HAVE_LIBINTL_H
 #define LIBINTL
 /*Workaround for heimdal define vs samba define*/
 #ifdef HAVE_LIBINTL_H
 #define LIBINTL

diff --git a/source4/include/includes.h b/source4/include/includes.h
index 8d28808194788b9bdf1e8dbc626772a267242ccf..796e313572d19e7682507350f492d8e3ba06baf0 100644 (file)
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -69,13 +69,4 @@
 #include "../lib/util/smb_threads.h"
 #include "../lib/util/smb_threads_internal.h"
 
 #include "../lib/util/smb_threads.h"
 #include "../lib/util/smb_threads_internal.h"
 

-#if defined(UID_WRAPPER)
-#if !defined(UID_WRAPPER_REPLACE) && !defined(UID_WRAPPER_NOT_REPLACE)
-#define UID_WRAPPER_REPLACE
-#include "../uid_wrapper/uid_wrapper.h"
-#endif
-#else
-#define uwrap_enabled() 0
-#endif
-

 #endif /* _INCLUDES_H */
 #endif /* _INCLUDES_H */

diff --git a/source4/ntvfs/posix/pvfs_acl.c b/source4/ntvfs/posix/pvfs_acl.c
index c20358be2aed56426ece9d7d0f4e81575e97d63e..c100abe5e73bd38e862615c29ce0417c3b9b1a62 100644 (file)
--- a/source4/ntvfs/posix/pvfs_acl.c
+++ b/source4/ntvfs/posix/pvfs_acl.c
@@ -26,6 +26,14 @@
 #include "libcli/security/security.h"
 #include "param/param.h"
 
 #include "libcli/security/security.h"
 #include "param/param.h"
 

+#if defined(UID_WRAPPER)
+#if !defined(UID_WRAPPER_REPLACE) && !defined(UID_WRAPPER_NOT_REPLACE)
+#define UID_WRAPPER_REPLACE
+#include "../uid_wrapper/uid_wrapper.h"
+#endif
+#else
+#define uwrap_enabled() 0
+#endif

 
 /* the list of currently registered ACL backends */
 static struct pvfs_acl_backend {
 
 /* the list of currently registered ACL backends */
 static struct pvfs_acl_backend {

diff --git a/source4/ntvfs/unixuid/vfs_unixuid.c b/source4/ntvfs/unixuid/vfs_unixuid.c
index 8102c995369bdcdb8941ef9486faea205d1cc5a4..85c70d7dd107ac1927e92f20a1019e914b9e26b6 100644 (file)
--- a/source4/ntvfs/unixuid/vfs_unixuid.c
+++ b/source4/ntvfs/unixuid/vfs_unixuid.c
@@ -29,6 +29,16 @@
 #define TEVENT_DEPRECATED
 #include <tevent.h>
 
 #define TEVENT_DEPRECATED
 #include <tevent.h>
 

+#if defined(UID_WRAPPER)
+#if !defined(UID_WRAPPER_REPLACE) && !defined(UID_WRAPPER_NOT_REPLACE)
+#define UID_WRAPPER_REPLACE
+#include "../uid_wrapper/uid_wrapper.h"
+#endif
+#else
+#define uwrap_enabled() 0
+#endif
+
+

 struct unixuid_private {
        struct wbc_context *wbc_ctx;
        struct unix_sec_ctx *last_sec_ctx;
 struct unixuid_private {
        struct wbc_context *wbc_ctx;
        struct unix_sec_ctx *last_sec_ctx;