svn commit: samba r21868 - in branches/SAMBA_3_0/source: lib smbd

[vlendec at samba.org]

Author: vlendec
Date: 2007-03-18 10:13:35 +0000 (Sun, 18 Mar 2007)
New Revision: 21868

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21868

Log:
Remove check_log_size from the central smbd processing loop. This can be done
with a become_root/unbecome_root in debug.c.

Modified:
   branches/SAMBA_3_0/source/lib/debug.c
   branches/SAMBA_3_0/source/smbd/process.c


Changeset:
Modified: branches/SAMBA_3_0/source/lib/debug.c
===================================================================
--- branches/SAMBA_3_0/source/lib/debug.c	2007-03-18 10:09:16 UTC (rev 21867)
+++ branches/SAMBA_3_0/source/lib/debug.c	2007-03-18 10:13:35 UTC (rev 21868)
@@ -688,20 +688,15 @@
 	int         maxlog;
 	SMB_STRUCT_STAT st;
 
-	/*
-	 *  We need to be root to check/change log-file, skip this and let the main
-	 *  loop check do a new check as root.
-	 */
-
-	if( geteuid() != 0 )
-		return;
-
 	if(log_overflow || !need_to_check_log_size() )
 		return;
 
 	maxlog = lp_max_log_size() * 1024;
 
 	if( sys_fstat( x_fileno( dbf ), &st ) == 0 && st.st_size > maxlog ) {
+
+		become_root_uid_only();
+
 		(void)reopen_logs();
 		if( dbf && get_file_size( debugf ) > maxlog ) {
 			pstring name;
@@ -714,6 +709,8 @@
 				(void)rename(name, debugf);
 			}
 		}
+
+		unbecome_root_uid_only();
 	}
 
 	/*

Modified: branches/SAMBA_3_0/source/smbd/process.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/process.c	2007-03-18 10:09:16 UTC (rev 21867)
+++ branches/SAMBA_3_0/source/smbd/process.c	2007-03-18 10:13:35 UTC (rev 21868)
@@ -1448,13 +1448,6 @@
   
 	update_monitored_printq_cache();
   
-	/*
-	 * Now we are root, check if the log files need pruning.
-	 * Force a log file check.
-	 */
-	force_check_log_size();
-	check_log_size();
-
 	/* Send any queued printer notify message to interested smbd's. */
 
 	print_notify_send_messages(0);