diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-02-15 16:18:58 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-02-18 15:09:46 +1100 |
| commit | d5d26e3269cea38f1cdcd060560ad5d1e3e23589 (patch) | |
| tree | b798f06ea55ce44524d1fb3c74a756316cf18a7f | |
| parent | 066a93d41cbb2ecbbcc63646c11a28d7ca291c76 (diff) | |
| download | samba-d5d26e3269cea38f1cdcd060560ad5d1e3e23589.tar.gz samba-d5d26e3269cea38f1cdcd060560ad5d1e3e23589.tar.bz2 samba-d5d26e3269cea38f1cdcd060560ad5d1e3e23589.zip | |
uid-wrapper: handle uwrap_enabled() as a macro
some s3 code defines uwrap_enabled() as a macro. Detect this, and
don't redeclare the functions
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | lib/uid_wrapper/uid_wrapper.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/uid_wrapper/uid_wrapper.h b/lib/uid_wrapper/uid_wrapper.h index 3d42223882..b3b11d954a 100644 --- a/lib/uid_wrapper/uid_wrapper.h +++ b/lib/uid_wrapper/uid_wrapper.h @@ -17,6 +17,7 @@ #ifndef __UID_WRAPPER_H__ #define __UID_WRAPPER_H__ +#ifndef uwrap_enabled int uwrap_enabled(void); int uwrap_seteuid(uid_t euid); @@ -68,4 +69,5 @@ gid_t uwrap_getgid(void); #endif #define getgid uwrap_getgid +#endif #endif /* __UID_WRAPPER_H__ */ |