[Selinux-commits] SF.net SVN: selinux: [2437] trunk/policycoreutils/setfiles/setfiles.c

[<kma...@us...>]

Revision: 2437
          http://svn.sourceforge.net/selinux/?rev=2437&view=rev
Author:   kmacmillan
Date:     2007-05-11 07:31:21 -0700 (Fri, 11 May 2007)

Log Message:
-----------
Author: Stephen Smalley
Email: sd...@ty...
Subject: Coalesce setfiles and restorecon into a single program
Date: Fri, 04 May 2007 15:39:47 -0400

On Fri, 2007-05-04 at 15:19 -0400, Stephen Smalley wrote:
> restorecon started life as a much simpler program, but has gradually
> grown to being largely a duplicate of setfiles, only differing in its
> interface and default behaviors.  Meanwhile, people keep adding features
> and options to both programs, leading to inconsistencies.
> 
> This patch coalesces setfiles and restorecon into a single program
> presenting different interfaces and default behaviors depending on
> basename(argv[0]), making restorecon a symlink to setfiles.
> 
> Unresolved issue: Current policy defines separate domains for the two
> programs.  We need to either coalesce the domains as well, or if there
> is legitimate reason for separating them, restorecon could remain a
> separate binary (either a complete separate copy or a wrapper) even if
> the sources are coalesced.
> 
> Comments?
> 

Grr...bug fix patch below, applies on top of the original one.

Acked-by: Karl MacMillan <kma...@me...>

Modified Paths:
--------------
    trunk/policycoreutils/setfiles/setfiles.c

Modified: trunk/policycoreutils/setfiles/setfiles.c
===================================================================
--- trunk/policycoreutils/setfiles/setfiles.c	2007-05-11 14:30:29 UTC (rev 2436)
+++ trunk/policycoreutils/setfiles/setfiles.c	2007-05-11 14:31:21 UTC (rev 2437)
@@ -541,6 +541,7 @@
 			exit(0);
 		}
 		/* Parent:  Check and label the files. */
+		rc = 0;
 		close(pipe_fds[1]);
 		if (nftw(name, apply_spec, 1024, nftw_flags)) {
 			fprintf(stderr,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.