summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2011-03-31 17:02:27 +0200
committerVolker Lendecke <vlendec@samba.org>2011-03-31 19:42:38 +0200
commit644222a1e36d18f8a57f815e74a08a78c26abb89 (patch)
tree3af68f415c94bb212e9b146b3063fd09f1bab656
parent1877508856264e8266200fc4e49795e3496b7292 (diff)
downloadsamba-644222a1e36d18f8a57f815e74a08a78c26abb89.tar.gz
samba-644222a1e36d18f8a57f815e74a08a78c26abb89.tar.bz2
samba-644222a1e36d18f8a57f815e74a08a78c26abb89.zip
debug: Restore the s3-style check in check_log_size()
This has caused me considerable grief. Autobuild-User: Volker Lendecke <vlendec@samba.org> Autobuild-Date: Thu Mar 31 19:42:38 CEST 2011 on sn-devel-104
-rw-r--r--lib/util/debug.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/util/debug.c b/lib/util/debug.c
index 2ff7cb2c58..9a6d30449b 100644
--- a/lib/util/debug.c
+++ b/lib/util/debug.c
@@ -643,7 +643,12 @@ void check_log_size( void )
* loop check do a new check as root.
*/
- if( geteuid() != 0) {
+#if _SAMBA_BUILD_ == 3
+ if (geteuid() != sec_initial_uid())
+#else
+ if( geteuid() != 0)
+#endif
+ {
/* We don't check sec_initial_uid() here as it isn't
* available in common code and we don't generally
* want to rotate and the possibly lose logs in