From: Volker Lendecke <vl@samba.org>
Date: Thu, 31 Mar 2011 15:02:27 +0000 (+0200)
Subject: debug: Restore the s3-style check in check_log_size()
X-Git-Tag: ldb-1.1.0~316
X-Git-Url: http://git.samba.org/samba.git/?p=samba.git;a=commitdiff_plain;h=644222a1e36d18f8a57f815e74a08a78c26abb89;hp=1877508856264e8266200fc4e49795e3496b7292

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
---

diff --git a/lib/util/debug.c b/lib/util/debug.c
index 2ff7cb2c588..9a6d30449b8 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