diff options
| author | Andrew Tridgell <tridge@samba.org> | 2009-08-05 11:21:06 +1000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2009-08-05 11:21:06 +1000 |
| commit | 58e5e1ea8d4c5a9eb8d36aa8132fd1ba3985ca53 (patch) | |
| tree | c66cc43d180750e40a4a7ffb42ca1bfe6bbd7f11 /source4/include | |
| parent | fd43e0ee09e3f82093e9a15dd6cbd2fbaa113426 (diff) | |
| download | samba-58e5e1ea8d4c5a9eb8d36aa8132fd1ba3985ca53.tar.gz samba-58e5e1ea8d4c5a9eb8d36aa8132fd1ba3985ca53.tar.bz2 samba-58e5e1ea8d4c5a9eb8d36aa8132fd1ba3985ca53.zip | |
make the UID_WRAPPER skip checks at runtime
This fixes two issues pointed out by Andrew. It adds a runtime
uwrap_enabled() call that wraps the skips needed for uid emulation. It
also makes the skip in the directory_create_or_exist() function only
change the uid checking code, not the permissions code
Diffstat (limited to 'source4/include')
| -rw-r--r-- | source4/include/includes.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source4/include/includes.h b/source4/include/includes.h index 37c6115f0f..e94c0fe633 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -73,9 +73,13 @@ #define TALLOC_ABORT(reason) smb_panic(reason) #endif -#if defined(UID_WRAPPER) && !defined(UID_WRAPPER_REPLACE) && !defined(UID_WRAPPER_NOT_REPLACE) +#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 */ |