* Latest patch for policycoreutils, reworked from previous.
@ 2006-09-14 12:30 Daniel J Walsh
2006-09-14 19:53 ` Stephen Smalley
0 siblings, 1 reply; 9+ messages in thread
From: Daniel J Walsh @ 2006-09-14 12:30 UTC (permalink / raw)
To: Stephen Smalley, SE Linux
[-- Attachment #1: Type: text/plain, Size: 660 bytes --]
Reworked patch to restorecon
Added -i qualified to ignore missing files. (-f) flag is already used
for filename. If you want to pick another qualifier, pick it, I am not
wed to -i.
Added ability to use stdout for -o qualifier, so -o - will now output to
stdout.
Changed verbose mode to print to stderr, so you can use -v and -o - at
the same time.
Add a change_ctr to allow restorecon to exit with the number of
"changed" files. Similar to what grep returns.
Also changes fixfiles to send only stdout to logfile so we can grab "-o
-" separately.
There is a bug in fixfiles which causes it not to handle multiple rpm
files which is also fixed.
[-- Attachment #2: policycoreutils-rhat.patch --]
[-- Type: text/x-patch, Size: 5477 bytes --]
diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/restorecon/restorecon.8 policycoreutils-1.30.29/restorecon/restorecon.8
--- nsapolicycoreutils/restorecon/restorecon.8 2006-08-28 16:58:19.000000000 -0400
+++ policycoreutils-1.30.29/restorecon/restorecon.8 2006-09-14 08:12:16.000000000 -0400
@@ -23,6 +23,9 @@
.SH "OPTIONS"
.TP
+.B \-i
+ignore files that do not exist
+.TP
.B \-f infilename
infilename contains a list of files to be processed by application. Use \- for stdin.
.TP
diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/restorecon/restorecon.c policycoreutils-1.30.29/restorecon/restorecon.c
--- nsapolicycoreutils/restorecon/restorecon.c 2006-09-01 22:32:11.000000000 -0400
+++ policycoreutils-1.30.29/restorecon/restorecon.c 2006-09-14 08:17:23.000000000 -0400
@@ -11,9 +11,10 @@
* restorecon [-Rnv] pathname...
*
* -e Specify directory to exclude
+ * -i Ignore error if file does not exist
* -n Do not change any file labels.
* -v Show changes in file labels.
- * -o filename save list of files with incorrect context
+ * -o filename save list of files with incorrect context
* -F Force reset of context to match file_context for customizable files
*
* pathname... The file(s) to label
@@ -41,12 +42,14 @@
#include <ftw.h>
static int change = 1;
+static int change_ctr = 0;
static int verbose = 0;
static int progress = 0;
static FILE *outfile = NULL;
static char *progname;
static int errors = 0;
static int recurse = 0;
+static int file_exist = 1;
static int force = 0;
#define STAT_BLOCK_SIZE 1
static int pipe_fds[2] = { -1, -1 };
@@ -129,7 +132,7 @@
void usage(const char *const name)
{
fprintf(stderr,
- "usage: %s [-FnrRv] [-e excludedir ] [-o filename ] [-f filename | pathname... ]\n",
+ "usage: %s [-iFonrRv] [-e excludedir ] [-o filename ] [-f filename | pathname... ]\n",
name);
exit(1);
}
@@ -160,7 +163,9 @@
}
if (lstat(filename, &st) != 0) {
- fprintf(stderr, "lstat(%s) failed: %s\n", filename,
+ if (!file_exist && errno == ENOENT)
+ return 0;
+ fprintf(outfile, "lstat(%s) failed: %s\n", filename,
strerror(errno));
return 1;
}
@@ -249,9 +251,12 @@
freecon(scontext);
return 1;
}
- }
+ }
+ else
+ change_ctr++;
+
if (verbose)
- printf("%s reset %s context %s->%s\n",
+ fprintf(stderr, "%s reset %s context %s->%s\n",
progname, filename,
(retcontext >=
0 ? prev_context : ""),
@@ -259,7 +264,7 @@
}
}
if (verbose > 1 && !force && customizable > 0) {
- printf("%s: %s not reset customized by admin to %s\n",
+ fprintf(stderr, "%s: %s not reset customized by admin to %s\n",
progname, filename, prev_context);
}
@@ -322,6 +327,8 @@
close(pipe_fds[1]);
if (rc == -1 || rc > 0) {
if (nftw(buf, apply_spec, 1024, FTW_PHYS)) {
+ if (!file_exist && errno == ENOENT)
+ return;
fprintf(stderr,
"%s: error while labeling files under %s\n",
progname, buf);
@@ -353,11 +360,14 @@
exit(0);
set_matchpathcon_flags(MATCHPATHCON_NOTRANS);
- while ((opt = getopt(argc, argv, "pFrRnvf:o:e:")) > 0) {
+ while ((opt = getopt(argc, argv, "ipFrRnvf:o:e:")) > 0) {
switch (opt) {
case 'n':
change = 0;
break;
+ case 'i':
+ file_exist = 0;
+ break;
case 'r':
case 'R':
recurse = 1;
@@ -370,13 +380,17 @@
exit(1);
break;
case 'o':
- outfile = fopen(optarg, "w");
- if (!outfile) {
- fprintf(stderr, "Error opening %s: %s\n",
- optarg, strerror(errno));
- usage(argv[0]);
+ if (strcmp(optarg,"-") == 0)
+ outfile=stdout;
+ else {
+ outfile = fopen(optarg, "w");
+ if (!outfile) {
+ fprintf(stderr, "Error opening %s: %s\n",
+ optarg, strerror(errno));
+ usage(argv[0]);
+ }
+ __fsetlocking(outfile, FSETLOCKING_BYCALLER);
}
- __fsetlocking(outfile, FSETLOCKING_BYCALLER);
break;
case 'v':
if (progress) {
@@ -425,8 +439,11 @@
process(argv[i]);
}
}
+
if (outfile)
fclose(outfile);
+ if (change) return change_ctr;
+
return errors;
}
diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.30.29/scripts/fixfiles
--- nsapolicycoreutils/scripts/fixfiles 2006-09-01 22:32:11.000000000 -0400
+++ policycoreutils-1.30.29/scripts/fixfiles 2006-09-14 08:12:16.000000000 -0400
@@ -117,8 +117,8 @@
exit $?
fi
if [ ! -z "$RPMFILES" ]; then
- for i in `echo $RPMFILES | sed 's/,/ /g'`; do
- rpmlist $i | ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $* -f - 2>&1 >> $LOGFILE
+ for i in `echo "$RPMFILES" | sed 's/,/ /g'`; do
+ rpmlist $i | ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -i $* -f - 2>> $LOGFILE
done
exit $?
fi
@@ -126,10 +126,10 @@
if [ -x /usr/bin/find ]; then
for d in ${DIRS} ; do find $d \
! \( -fstype ext2 -o -fstype ext3 -o -fstype jfs -o -fstype xfs \) -prune -o -print | \
- ${RESTORECON} ${OUTFILES} ${FORCEFLAG} $* -f - 2>&1 >> $LOGFILE
+ ${RESTORECON} ${OUTFILES} ${FORCEFLAG} $* -f - 2>> $LOGFILE
done
else
- ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $* $DIRS 2>&1 >> $LOGFILE
+ ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $* $DIRS 2>> $LOGFILE
fi
exit $?
@@ -219,7 +219,7 @@
# check if they specified both DIRS and RPMFILES
#
-if [ ! -z $RPMFILES ]; then
+if [ ! -z "$RPMFILES" ]; then
if [ $OPTIND -le $# ]; then
usage
fi
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: Latest patch for policycoreutils, reworked from previous.
2006-09-14 12:30 Latest patch for policycoreutils, reworked from previous Daniel J Walsh
@ 2006-09-14 19:53 ` Stephen Smalley
2006-09-14 20:13 ` Steve G
0 siblings, 1 reply; 9+ messages in thread
From: Stephen Smalley @ 2006-09-14 19:53 UTC (permalink / raw)
To: Daniel J Walsh; +Cc: SE Linux
On Thu, 2006-09-14 at 08:30 -0400, Daniel J Walsh wrote:
> Reworked patch to restorecon
>
> Added -i qualified to ignore missing files. (-f) flag is already used
> for filename. If you want to pick another qualifier, pick it, I am not
> wed to -i.
>
> Added ability to use stdout for -o qualifier, so -o - will now output to
> stdout.
>
> Changed verbose mode to print to stderr, so you can use -v and -o - at
> the same time.
>
>
> Add a change_ctr to allow restorecon to exit with the number of
> "changed" files. Similar to what grep returns.
>
> Also changes fixfiles to send only stdout to logfile so we can grab "-o
> -" separately.
>
> There is a bug in fixfiles which causes it not to handle multiple rpm
> files which is also fixed.
diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/restorecon/restorecon.c policycoreutils-1.30.29/restorecon/restorecon.c
--- nsapolicycoreutils/restorecon/restorecon.c 2006-09-01 22:32:11.000000000 -0400
+++ policycoreutils-1.30.29/restorecon/restorecon.c 2006-09-14 08:17:23.000000000 -0400
@@ -129,7 +132,7 @@
void usage(const char *const name)
{
fprintf(stderr,
- "usage: %s [-FnrRv] [-e excludedir ] [-o filename ] [-f filename | pathname... ]\n",
+ "usage: %s [-iFonrRv] [-e excludedir ] [-o filename ] [-f filename | pathname... ]\n",
Doesn't reflect the new usage in the reworked patch (no -o by itself, but -o - | -o filename).
@@ -160,7 +163,9 @@
}
if (lstat(filename, &st) != 0) {
- fprintf(stderr, "lstat(%s) failed: %s\n", filename,
+ if (!file_exist && errno == ENOENT)
+ return 0;
+ fprintf(outfile, "lstat(%s) failed: %s\n", filename,
strerror(errno));
This is an actual error message, so I don't know why you want it in
outfile, and outfile can be NULL here.
return 1;
}
@@ -249,9 +251,12 @@
freecon(scontext);
return 1;
}
- }
+ }
+ else
+ change_ctr++;
+
if (verbose)
- printf("%s reset %s context %s->%s\n",
+ fprintf(stderr, "%s reset %s context %s->%s\n",
progname, filename,
(retcontext >=
0 ? prev_context : ""),
@@ -259,7 +264,7 @@
}
}
if (verbose > 1 && !force && customizable > 0) {
- printf("%s: %s not reset customized by admin to %s\n",
+ fprintf(stderr, "%s: %s not reset customized by admin to %s\n",
progname, filename, prev_context);
}
The -v output seems to be a superset of the -o output. So why do you
need them to be run simultaneously and fed to two separate streams?
--
Stephen Smalley
National Security Agency
--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: Latest patch for policycoreutils, reworked from previous.
2006-09-14 19:53 ` Stephen Smalley
@ 2006-09-14 20:13 ` Steve G
2006-09-14 20:25 ` Stephen Smalley
0 siblings, 1 reply; 9+ messages in thread
From: Steve G @ 2006-09-14 20:13 UTC (permalink / raw)
To: Stephen Smalley, Daniel J Walsh; +Cc: SE Linux
>The -v output seems to be a superset of the -o output. So why do you
>need them to be run simultaneously and fed to two separate streams?
What I was wanting out of all this is a way to collect just the full path of
files that have a labelling problem and nothing else. If you send it to a file,
you get avcs.
-Steve
__________________________________________________
Do You Yahoo!?
Tired of spam? Yahoo! Mail has the best spam protection around
http://mail.yahoo.com
--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: Latest patch for policycoreutils, reworked from previous.
2006-09-14 20:13 ` Steve G
@ 2006-09-14 20:25 ` Stephen Smalley
2006-09-14 21:00 ` Steve G
0 siblings, 1 reply; 9+ messages in thread
From: Stephen Smalley @ 2006-09-14 20:25 UTC (permalink / raw)
To: Steve G; +Cc: Daniel J Walsh, SE Linux
On Thu, 2006-09-14 at 13:13 -0700, Steve G wrote:
> >The -v output seems to be a superset of the -o output. So why do you
> >need them to be run simultaneously and fed to two separate streams?
>
> What I was wanting out of all this is a way to collect just the full path of
> files that have a labelling problem and nothing else. If you send it to a file,
> you get avcs.
Sure, so why can't you use -o - (with this patch) but not pass -v,
thereby avoiding the need to change -v handling altogether?
--
Stephen Smalley
National Security Agency
--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: Latest patch for policycoreutils, reworked from previous.
2006-09-14 20:25 ` Stephen Smalley
@ 2006-09-14 21:00 ` Steve G
2006-09-15 13:25 ` Daniel J Walsh
0 siblings, 1 reply; 9+ messages in thread
From: Steve G @ 2006-09-14 21:00 UTC (permalink / raw)
To: Stephen Smalley; +Cc: Daniel J Walsh, SE Linux
>Sure, so why can't you use -o - (with this patch) but not pass -v,
>thereby avoiding the need to change -v handling altogether?
OK, I'll give that a try. I'll let Dan explain the -v...
-Steve
__________________________________________________
Do You Yahoo!?
Tired of spam? Yahoo! Mail has the best spam protection around
http://mail.yahoo.com
--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: Latest patch for policycoreutils, reworked from previous.
2006-09-14 21:00 ` Steve G
@ 2006-09-15 13:25 ` Daniel J Walsh
2006-09-15 21:03 ` Stephen Smalley
2006-09-18 20:24 ` Stephen Smalley
0 siblings, 2 replies; 9+ messages in thread
From: Daniel J Walsh @ 2006-09-15 13:25 UTC (permalink / raw)
To: Steve G; +Cc: Stephen Smalley, SE Linux
[-- Attachment #1: Type: text/plain, Size: 118 bytes --]
Reworked patch.
restorecon -v goes back to stdout
added "verify" to print out files with out the verbose mode.
Dan
[-- Attachment #2: policycoreutils-rhat.patch --]
[-- Type: text/x-patch, Size: 4595 bytes --]
diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/restorecon/restorecon.8 policycoreutils-1.30.29/restorecon/restorecon.8
--- nsapolicycoreutils/restorecon/restorecon.8 2006-08-28 16:58:19.000000000 -0400
+++ policycoreutils-1.30.29/restorecon/restorecon.8 2006-09-15 09:19:49.000000000 -0400
@@ -23,6 +23,9 @@
.SH "OPTIONS"
.TP
+.B \-i
+ignore files that do not exist
+.TP
.B \-f infilename
infilename contains a list of files to be processed by application. Use \- for stdin.
.TP
diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/restorecon/restorecon.c policycoreutils-1.30.29/restorecon/restorecon.c
--- nsapolicycoreutils/restorecon/restorecon.c 2006-09-01 22:32:11.000000000 -0400
+++ policycoreutils-1.30.29/restorecon/restorecon.c 2006-09-15 09:19:49.000000000 -0400
@@ -11,9 +11,10 @@
* restorecon [-Rnv] pathname...
*
* -e Specify directory to exclude
+ * -i Ignore error if file does not exist
* -n Do not change any file labels.
* -v Show changes in file labels.
- * -o filename save list of files with incorrect context
+ * -o filename save list of files with incorrect context
* -F Force reset of context to match file_context for customizable files
*
* pathname... The file(s) to label
@@ -41,12 +42,14 @@
#include <ftw.h>
static int change = 1;
+static int change_ctr = 0;
static int verbose = 0;
static int progress = 0;
static FILE *outfile = NULL;
static char *progname;
static int errors = 0;
static int recurse = 0;
+static int file_exist = 1;
static int force = 0;
#define STAT_BLOCK_SIZE 1
static int pipe_fds[2] = { -1, -1 };
@@ -129,7 +132,7 @@
void usage(const char *const name)
{
fprintf(stderr,
- "usage: %s [-FnrRv] [-e excludedir ] [-o filename ] [-f filename | pathname... ]\n",
+ "usage: %s [-iFnrRv] [-e excludedir ] [-o filename ] [-f filename | pathname... ]\n",
name);
exit(1);
}
@@ -160,6 +163,8 @@
}
if (lstat(filename, &st) != 0) {
+ if (!file_exist && errno == ENOENT)
+ return 0;
fprintf(stderr, "lstat(%s) failed: %s\n", filename,
strerror(errno));
return 1;
@@ -249,7 +254,10 @@
freecon(scontext);
return 1;
}
- }
+ }
+ else
+ change_ctr++;
+
if (verbose)
printf("%s reset %s context %s->%s\n",
progname, filename,
@@ -322,6 +330,8 @@
close(pipe_fds[1]);
if (rc == -1 || rc > 0) {
if (nftw(buf, apply_spec, 1024, FTW_PHYS)) {
+ if (!file_exist && errno == ENOENT)
+ return;
fprintf(stderr,
"%s: error while labeling files under %s\n",
progname, buf);
@@ -353,11 +363,14 @@
exit(0);
set_matchpathcon_flags(MATCHPATHCON_NOTRANS);
- while ((opt = getopt(argc, argv, "pFrRnvf:o:e:")) > 0) {
+ while ((opt = getopt(argc, argv, "ipFrRnvf:o:e:")) > 0) {
switch (opt) {
case 'n':
change = 0;
break;
+ case 'i':
+ file_exist = 0;
+ break;
case 'r':
case 'R':
recurse = 1;
@@ -370,13 +383,17 @@
exit(1);
break;
case 'o':
- outfile = fopen(optarg, "w");
- if (!outfile) {
- fprintf(stderr, "Error opening %s: %s\n",
- optarg, strerror(errno));
- usage(argv[0]);
+ if (strcmp(optarg,"-") == 0)
+ outfile=stdout;
+ else {
+ outfile = fopen(optarg, "w");
+ if (!outfile) {
+ fprintf(stderr, "Error opening %s: %s\n",
+ optarg, strerror(errno));
+ usage(argv[0]);
+ }
+ __fsetlocking(outfile, FSETLOCKING_BYCALLER);
}
- __fsetlocking(outfile, FSETLOCKING_BYCALLER);
break;
case 'v':
if (progress) {
@@ -428,5 +445,7 @@
if (outfile)
fclose(outfile);
+ if (change) return change_ctr;
+
return errors;
}
diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.30.29/scripts/fixfiles
--- nsapolicycoreutils/scripts/fixfiles 2006-09-01 22:32:11.000000000 -0400
+++ policycoreutils-1.30.29/scripts/fixfiles 2006-09-15 09:20:06.000000000 -0400
@@ -117,7 +117,7 @@
exit $?
fi
if [ ! -z "$RPMFILES" ]; then
- for i in `echo $RPMFILES | sed 's/,/ /g'`; do
+ for i in `echo "$RPMFILES" | sed 's/,/ /g'`; do
rpmlist $i | ${RESTORECON} ${OUTFILES} ${FORCEFLAG} -R $* -f - 2>&1 >> $LOGFILE
done
exit $?
@@ -219,7 +219,7 @@
# check if they specified both DIRS and RPMFILES
#
-if [ ! -z $RPMFILES ]; then
+if [ ! -z "$RPMFILES" ]; then
if [ $OPTIND -le $# ]; then
usage
fi
@@ -236,6 +236,7 @@
case "$command" in
restore) restore -p ;;
check) restore -n -v ;;
+ verify) restore -n -o -;;
relabel) relabel;;
*)
usage
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: Latest patch for policycoreutils, reworked from previous.
2006-09-15 13:25 ` Daniel J Walsh
@ 2006-09-15 21:03 ` Stephen Smalley
2006-09-18 20:24 ` Stephen Smalley
1 sibling, 0 replies; 9+ messages in thread
From: Stephen Smalley @ 2006-09-15 21:03 UTC (permalink / raw)
To: Daniel J Walsh; +Cc: Steve G, SE Linux
On Fri, 2006-09-15 at 09:25 -0400, Daniel J Walsh wrote:
> Reworked patch.
>
> restorecon -v goes back to stdout
>
> added "verify" to print out files with out the verbose mode.
Acked-by: Stephen Smalley <sds@tycho.nsa.gov>
--
Stephen Smalley
National Security Agency
--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: Latest patch for policycoreutils, reworked from previous.
2006-09-15 13:25 ` Daniel J Walsh
2006-09-15 21:03 ` Stephen Smalley
@ 2006-09-18 20:24 ` Stephen Smalley
2006-09-18 21:37 ` Daniel J Walsh
1 sibling, 1 reply; 9+ messages in thread
From: Stephen Smalley @ 2006-09-18 20:24 UTC (permalink / raw)
To: Daniel J Walsh; +Cc: Steve G, SE Linux
On Fri, 2006-09-15 at 09:25 -0400, Daniel J Walsh wrote:
> Reworked patch.
>
> restorecon -v goes back to stdout
>
> added "verify" to print out files with out the verbose mode.
Hmm...just noticed this:
diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/restorecon/restorecon.c policycoreutils-1.30.29/restorecon/restorecon.c
--- nsapolicycoreutils/restorecon/restorecon.c 2006-09-01 22:32:11.000000000 -0400
+++ policycoreutils-1.30.29/restorecon/restorecon.c 2006-09-15 09:19:49.000000000 -0400
@@ -249,7 +254,10 @@
freecon(scontext);
return 1;
}
- }
+ }
+ else
+ change_ctr++;
+
I don't think this is matching up with the right if statement; it
currently matches if (change), so it only executes if restorecon is
making no changes (-n option). Looks like you meant it to match the if
(lsetfilecon(...) < 0).
<snip>
@@ -428,5 +445,7 @@
if (outfile)
fclose(outfile);
+ if (change) return change_ctr;
+
return errors;
}
The problem here is that existing callers may assume that an exit status
of non-zero means failure. Again, an interface change. How did you
intend to use this?
--
Stephen Smalley
National Security Agency
--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: Latest patch for policycoreutils, reworked from previous.
2006-09-18 20:24 ` Stephen Smalley
@ 2006-09-18 21:37 ` Daniel J Walsh
0 siblings, 0 replies; 9+ messages in thread
From: Daniel J Walsh @ 2006-09-18 21:37 UTC (permalink / raw)
To: Stephen Smalley; +Cc: Steve G, SE Linux
Stephen Smalley wrote:
> On Fri, 2006-09-15 at 09:25 -0400, Daniel J Walsh wrote:
>
>> Reworked patch.
>>
>> restorecon -v goes back to stdout
>>
>> added "verify" to print out files with out the verbose mode.
>>
>
> Hmm...just noticed this:
>
> diff --exclude-from=exclude --exclude='*.po' -N -u -r nsapolicycoreutils/restorecon/restorecon.c policycoreutils-1.30.29/restorecon/restorecon.c
> --- nsapolicycoreutils/restorecon/restorecon.c 2006-09-01 22:32:11.000000000 -0400
> +++ policycoreutils-1.30.29/restorecon/restorecon.c 2006-09-15 09:19:49.000000000 -0400
> @@ -249,7 +254,10 @@
> freecon(scontext);
> return 1;
> }
> - }
> + }
> + else
> + change_ctr++;
> +
>
>
> I don't think this is matching up with the right if statement; it
> currently matches if (change), so it only executes if restorecon is
> making no changes (-n option). Looks like you meant it to match the if
> (lsetfilecon(...) < 0).
>
> <snip>
> @@ -428,5 +445,7 @@
> if (outfile)
> fclose(outfile);
>
> + if (change) return change_ctr;
>
Yes this should be
if (!change) return change_ctr;
The idea is to check how many files would be changed if the tool was
run, as opposed to whether
the tool was successful.
I agree this is a little shaky.
> +
> return errors;
> }
>
> The problem here is that existing callers may assume that an exit status
> of non-zero means failure. Again, an interface change. How did you
> intend to use this?
>
>
--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2006-09-18 21:37 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-09-14 12:30 Latest patch for policycoreutils, reworked from previous Daniel J Walsh
2006-09-14 19:53 ` Stephen Smalley
2006-09-14 20:13 ` Steve G
2006-09-14 20:25 ` Stephen Smalley
2006-09-14 21:00 ` Steve G
2006-09-15 13:25 ` Daniel J Walsh
2006-09-15 21:03 ` Stephen Smalley
2006-09-18 20:24 ` Stephen Smalley
2006-09-18 21:37 ` Daniel J Walsh
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.