diff options
| author | Andreas Schneider <asn@samba.org> | 2011-10-08 12:10:20 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@samba.org> | 2011-10-27 13:32:02 +0200 |
| commit | 7b5fb7d9e88bf848173363f5a1e2a0f1db6c7293 (patch) | |
| tree | 11e9fdc1edfd9e0433291f60a05e837b65e0c21c /lib/replace/system | |
| parent | 2f65ae25df489028963825940274703100eb1365 (diff) | |
| download | samba-7b5fb7d9e88bf848173363f5a1e2a0f1db6c7293.tar.gz samba-7b5fb7d9e88bf848173363f5a1e2a0f1db6c7293.tar.bz2 samba-7b5fb7d9e88bf848173363f5a1e2a0f1db6c7293.zip | |
replace: Add don't include unistd.h directly and add uid_wrapper.
Diffstat (limited to 'lib/replace/system')
| -rw-r--r-- | lib/replace/system/filesys.h | 11 | ||||
| -rw-r--r-- | lib/replace/system/network.h | 13 |
2 files changed, 24 insertions, 0 deletions
diff --git a/lib/replace/system/filesys.h b/lib/replace/system/filesys.h index 47ea4e4030..e2c3c1dd72 100644 --- a/lib/replace/system/filesys.h +++ b/lib/replace/system/filesys.h @@ -189,4 +189,15 @@ #define mkdir(d,m) _mkdir(d) #endif +#ifdef UID_WRAPPER +# ifndef UID_WRAPPER_DISABLE +# ifndef UID_WRAPPER_NOT_REPLACE +# define UID_WRAPPER_REPLACE +# endif /* UID_WRAPPER_NOT_REPLACE */ +# include "../uid_wrapper/uid_wrapper.h" +# endif /* UID_WRAPPER_DISABLE */ +#else /* UID_WRAPPER */ +# define uwrap_enabled() 0 +#endif /* UID_WRAPPER */ + #endif diff --git a/lib/replace/system/network.h b/lib/replace/system/network.h index a4e6a7e31a..7cb8d7becf 100644 --- a/lib/replace/system/network.h +++ b/lib/replace/system/network.h @@ -31,6 +31,8 @@ #error "AC_LIBREPLACE_NETWORK_CHECKS missing in configure" #endif +#include <unistd.h> + #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> #endif @@ -374,4 +376,15 @@ struct addrinfo { #endif /* SOCKET_WRAPPER_DISABLE */ #endif /* SOCKET_WRAPPER */ +#ifdef UID_WRAPPER +# ifndef UID_WRAPPER_DISABLE +# ifndef UID_WRAPPER_NOT_REPLACE +# define UID_WRAPPER_REPLACE +# endif /* UID_WRAPPER_NOT_REPLACE */ +# include "../uid_wrapper/uid_wrapper.h" +# endif /* UID_WRAPPER_DISABLE */ +#else /* UID_WRAPPER */ +# define uwrap_enabled() 0 +#endif /* UID_WRAPPER */ + #endif |