rpms/vixie-cron/FC-4 vixie-cron-4.1-_42-bz178431.patch, 1.1, 1.2 vixie-cron-4.1-_43-bz173926.patch, 1.1, 1.2 vixie-cron.spec, 1.52, 1.53

Thu Jan 26 19:05:17 UTC 2006

Author: jvdias

Update of /cvs/dist/rpms/vixie-cron/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv31519

Modified Files:
	vixie-cron-4.1-_42-bz178431.patch 
	vixie-cron-4.1-_43-bz173926.patch vixie-cron.spec 
Log Message:
fix bug 178931 / 178939: silence pam_krb5 debug messages


vixie-cron-4.1-_42-bz178431.patch:
 do_command.c |  121 ++++++++++++++++++++++++++++-------------------------------
 1 files changed, 59 insertions(+), 62 deletions(-)

Index: vixie-cron-4.1-_42-bz178431.patch
===================================================================
RCS file: /cvs/dist/rpms/vixie-cron/FC-4/vixie-cron-4.1-_42-bz178431.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2

--- vixie-cron-4.1-_42-bz178431.patch	24 Jan 2006 00:03:55 -0000	1.1
+++ vixie-cron-4.1-_42-bz178431.patch	26 Jan 2006 19:05:00 -0000	1.2
@@ -1,5 +1,5 @@
---- vixie-cron-4.1/do_command.c.bz178431	2006-01-23 17:16:54.000000000 -0500
-+++ vixie-cron-4.1/do_command.c	2006-01-23 18:43:24.000000000 -0500
+--- vixie-cron-4.1/do_command.c.bz178431	2006-01-23 18:59:37.000000000 -0500
++++ vixie-cron-4.1/do_command.c	2006-01-26 13:53:20.000000000 -0500
 @@ -107,7 +107,7 @@
  #if defined(WITH_PAM)
  	int		retcode = 0;
@@ -17,7 +17,24 @@
  #endif
  
  	/* fork again, this time so we can exec the user's command.
-@@ -259,71 +260,40 @@
+@@ -218,6 +219,16 @@
+ 			log_it(usernm, getpid(), "CMD", x);
+ 			free(x);
+ 		}
++		
++		time_t minutely_time = 0;
++		if((e->flags & MIN_STAR)==MIN_STAR)
++		{
++		    /* "minute-ly" job: Every minute for given hour/dow/month/dom. 
++		     * Ensure that these jobs never run in the same minute:
++		     */
++		    minutely_time = time(0);
++		    Debug(DSCH, ("Minute-ly job. Recording time %lu\n", minutely_time))
++		}
+ 
+ 		/* that's the last thing we'll log.  close the log files.
+ 		 */
+@@ -259,71 +270,40 @@
  		/* set our directory, uid and gid.  Set gid first, since once
  		 * we set uid, we've lost root privledges.
  		 */
@@ -114,7 +131,7 @@
  
  # if DEBUGGING
  			if (DebugFlags & DTEST) {
-@@ -339,16 +309,17 @@
+@@ -339,16 +319,33 @@
  			if ((is_selinux_enabled() >0) && (u->scontext != 0L)) {
  				if (setexeccon(u->scontext) < 0) {
  					if (security_getenforce() > 0) {
@@ -130,13 +147,29 @@
  				}
  			}
  #endif
++			time_t job_run_time = time(0L);
++
++			if( (minutely_time > 0)
++		          &&((job_run_time / 60) != (minutely_time / 60))
++			  )
++			{
++			    struct tm tmS, tmN;
++			    localtime_r(&job_run_time, &tmN);
++			    localtime_r(&minutely_time,&tmS);
++			    openlog(ProgramName, LOG_PID, LOG_CRON);
++			    syslog(LOG_ERR, 
++				   "(%s) error: Job execution of per-minute job scheduled for "
++				   "%.2u:%.2u delayed into subsequent minute %.2u:%.2u. Skipping job run.",
++				   e->pwd->pw_name, tmS.tm_hour, tmS.tm_min, tmN.tm_hour, tmN.tm_min);
++			    _exit(ERROR_EXIT);
++			}
  
 -			execle(shell, shell, "-c", e->cmd, (char *)0, e->envp);
 +			execle(shell, shell, "-c", e->cmd, (char *)0, jobenv);
  			fprintf(stderr, "execl: couldn't exec `%s'\n", shell);
  			perror("execl");
  			_exit(ERROR_EXIT);
-@@ -513,7 +484,7 @@
+@@ -513,7 +510,7 @@
  				fprintf(mail, "Date: %s\n",
  					arpadate(&StartTime));
  #endif /*MAIL_DATE*/

vixie-cron-4.1-_43-bz173926.patch:
 crond.pam |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

Index: vixie-cron-4.1-_43-bz173926.patch
===================================================================
RCS file: /cvs/dist/rpms/vixie-cron/FC-4/vixie-cron-4.1-_43-bz173926.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vixie-cron-4.1-_43-bz173926.patch	24 Jan 2006 00:05:31 -0000	1.1
+++ vixie-cron-4.1-_43-bz173926.patch	26 Jan 2006 19:05:00 -0000	1.2
@@ -1,16 +1,15 @@
---- vixie-cron-4.1/crond.pam.bz173926	2006-01-23 18:48:04.000000000 -0500
-+++ vixie-cron-4.1/crond.pam	2006-01-23 18:57:57.000000000 -0500
-@@ -7,10 +7,7 @@
+--- vixie-cron-4.1/crond.pam.bz173926	2006-01-23 18:59:37.000000000 -0500
++++ vixie-cron-4.1/crond.pam	2006-01-26 13:57:00.000000000 -0500
+@@ -7,10 +7,6 @@
  auth       required   pam_env.so
  account    required   pam_stack.so service=system-auth
  account    required   pam_access.so
 -session    required   pam_stack.so service=system-auth
-+session	   required   pam_limits.so
++session    required   pam_limits.so
  session    required   pam_loginuid.so
 -# To enable PAM user limits for cron jobs, 
 -# configure /etc/security/limits.conf and 
 -# uncomment this line:
 -# session  required   pam_limits.so
 -#
-+session	   required   pam_krb5.so
 +


Index: vixie-cron.spec
===================================================================
RCS file: /cvs/dist/rpms/vixie-cron/FC-4/vixie-cron.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- vixie-cron.spec	24 Jan 2006 00:07:56 -0000	1.52
+++ vixie-cron.spec	26 Jan 2006 19:05:00 -0000	1.53
@@ -7,7 +7,7 @@
 Summary: The Vixie cron daemon for executing specified programs at set times.
 Name: vixie-cron
 Version: 4.1
-Release: 40.FC4
+Release: 41.FC4
 Epoch:   4
 License: distributable
 Group:   System Environment/Base
@@ -188,6 +188,9 @@
 %config(noreplace) /etc/sysconfig/crond
 
 %changelog
+* Thu Jan 26 2006 Jason Vas Dias <jvdias at redhat.com> - 4.1-41.FC4
+- fix bug 178931 / 178939: silence pam_krb5 debug messages
+
 * Mon Jan 23 2006 Jason Vas Dias <jvdias at redhat.com> - 4.1-40.FC4
 - fix bug 178431: if a pam_limits hard nproc limit is exceeded, 
   do not allow user's job to run


