rpms/vixie-cron/devel vixie-cron-4.1-_53_bz199294_selinux_mls.patch, 1.1, 1.2

[fedora-cvs-commits at redhat.com]

Author: jvdias

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

Modified Files:
	vixie-cron-4.1-_53_bz199294_selinux_mls.patch 
Log Message:
fix bugs 198019, 199294

vixie-cron-4.1-_53_bz199294_selinux_mls.patch:
 crontab.1  |    8 ++
 crontab.5  |   13 +++
 crontab.c  |   55 +++++++++++----
 funcs.h    |    4 -
 security.c |  219 ++++++++++++++++++++++++++++++++++++++++++++++++++-----------
 5 files changed, 245 insertions(+), 54 deletions(-)

Index: vixie-cron-4.1-_53_bz199294_selinux_mls.patch
===================================================================
RCS file: /cvs/dist/rpms/vixie-cron/devel/vixie-cron-4.1-_53_bz199294_selinux_mls.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vixie-cron-4.1-_53_bz199294_selinux_mls.patch	21 Jul 2006 02:01:21 -0000	1.1
+++ vixie-cron-4.1-_53_bz199294_selinux_mls.patch	21 Jul 2006 02:12:09 -0000	1.2
@@ -1,5 +1,5 @@
---- vixie-cron-4.1/crontab.c.selinux_mls	2006-07-20 20:10:27.000000000 -0400
-+++ vixie-cron-4.1/crontab.c	2006-07-20 20:10:27.000000000 -0400
+--- vixie-cron-4.1/crontab.c.selinux_mls	2006-07-20 21:47:56.000000000 -0400
++++ vixie-cron-4.1/crontab.c	2006-07-20 22:03:57.000000000 -0400
 @@ -43,10 +43,19 @@
  
  #if DEBUGGING
@@ -56,7 +56,7 @@
  	struct stat statbuf;
  	struct utimbuf utimebuf;
  	WAIT_T waiter;
-@@ -379,26 +401,22 @@
+@@ -379,26 +401,25 @@
  	}
  
  	Set_LineNum(1)
@@ -87,13 +87,16 @@
 +
 +#ifdef WITH_SELINUX
 +	if ( selinux_context )
++	{
 +		fprintf(NewCrontab,"SELINUX_ROLE_TYPE=%s\n", selinux_context);
++		selinux_context = 0;
++	}
 +#endif
 +
  	fclose(f);
  	if (fflush(NewCrontab) < OK) {
  		perror(Filename);
-@@ -610,6 +628,10 @@
+@@ -610,6 +631,10 @@
  	 *fprintf(tmp, "# (%s installed on %-24.24s)\n", Filename, ctime(&now));
  	 *fprintf(tmp, "# (Cron version %s -- %s)\n", CRON_VERSION, rcsid);
  	 */
@@ -104,8 +107,8 @@
  
  	/* copy the crontab to the tmp
  	 */
---- vixie-cron-4.1/funcs.h.selinux_mls	2006-07-20 20:10:27.000000000 -0400
-+++ vixie-cron-4.1/funcs.h	2006-07-20 20:10:27.000000000 -0400
+--- vixie-cron-4.1/funcs.h.selinux_mls	2006-07-20 21:47:56.000000000 -0400
++++ vixie-cron-4.1/funcs.h	2006-07-20 21:47:56.000000000 -0400
 @@ -88,7 +88,9 @@
  
  int cron_change_user( struct passwd *pw );
@@ -117,8 +120,8 @@
  
  int get_security_context(const char *name, 
  			 int crontab_fd, 
---- vixie-cron-4.1/crontab.1.selinux_mls	2006-07-20 20:10:26.000000000 -0400
-+++ vixie-cron-4.1/crontab.1	2006-07-20 20:10:27.000000000 -0400
+--- vixie-cron-4.1/crontab.1.selinux_mls	2006-07-20 21:47:55.000000000 -0400
++++ vixie-cron-4.1/crontab.1	2006-07-20 21:47:56.000000000 -0400
 @@ -32,6 +32,7 @@
  .RB [ -u
  .IR user ]
@@ -141,8 +144,8 @@
  .SH "SEE ALSO"
  crontab(5), cron(8)
  .SH FILES
---- vixie-cron-4.1/crontab.5.selinux_mls	2006-07-20 20:10:27.000000000 -0400
-+++ vixie-cron-4.1/crontab.5	2006-07-20 20:10:27.000000000 -0400
+--- vixie-cron-4.1/crontab.5.selinux_mls	2006-07-20 21:47:56.000000000 -0400
++++ vixie-cron-4.1/crontab.5	2006-07-20 21:47:56.000000000 -0400
 @@ -87,6 +87,19 @@
  setting the CONTENT_TYPE and CONTENT_TRANSFER_ENCODING variables in crontabs,
  to the correct values of the mail headers of those names.  
@@ -163,8 +166,8 @@
  The format of a cron command is very much the V7 standard, with a number of
  upward-compatible extensions.  Each line has five time and date fields,
  followed by a user name if this is the system crontab file,
---- vixie-cron-4.1/security.c.selinux_mls	2006-07-20 20:10:27.000000000 -0400
-+++ vixie-cron-4.1/security.c	2006-07-20 20:29:32.000000000 -0400
+--- vixie-cron-4.1/security.c.selinux_mls	2006-07-20 21:47:56.000000000 -0400
++++ vixie-cron-4.1/security.c	2006-07-20 21:47:56.000000000 -0400
 @@ -49,23 +49,49 @@
  	      );
  	return -1;