The branch, master has been updated via 644222a debug: Restore the s3-style check in check_log_size() from 1877508 s3:configure: allow building without SCHEDULE_FOR_DELETION with --enable-old-ctdb
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 644222a1e36d18f8a57f815e74a08a78c26abb89 Author: Volker Lendecke <v...@samba.org> Date: Thu Mar 31 17:02:27 2011 +0200 debug: Restore the s3-style check in check_log_size() This has caused me considerable grief. Autobuild-User: Volker Lendecke <vlen...@samba.org> Autobuild-Date: Thu Mar 31 19:42:38 CEST 2011 on sn-devel-104 ----------------------------------------------------------------------- Summary of changes: lib/util/debug.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/util/debug.c b/lib/util/debug.c index 2ff7cb2..9a6d304 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 -- Samba Shared Repository