git.samba.org
/
metze
/
samba
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
066a93d
)
uid-wrapper: handle uwrap_enabled() as a macro
author
Andrew Tridgell
<tridge@samba.org>
Tue, 15 Feb 2011 05:18:58 +0000
(16:18 +1100)
committer
Andrew Tridgell
<tridge@samba.org>
Fri, 18 Feb 2011 04:09:46 +0000
(15:09 +1100)
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>
lib/uid_wrapper/uid_wrapper.h
patch
|
blob
|
history
diff --git
a/lib/uid_wrapper/uid_wrapper.h
b/lib/uid_wrapper/uid_wrapper.h
index 3d4222388296ccb637be543b92aeccbe67f7f5c4..b3b11d954ae4ffcfaedebd636b1a35a70c3714b0 100644
(file)
--- 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__ */