Re: New patch for fixfiles sed script

[Daniel J Walsh <dwalsh@redhat.com>]

One more fix to sed script

 +++ policycoreutils-1.21.10/scripts/fixfiles  2005-02-02 
13:37:23.000000000 -0500
166,168c166,168
< +               -e 's|\.\*|*|g' \
< +               -e 's|\.\+|*|g' | \
< +     sort -u | \
---
 > +               -e 's|\.\*.*|*|g' \
 > +               -e 's|\.\+.*|*|g' | \
 > +     sort -d -u | \
179c179
< +     ${RESTORECON} -R $2 -v -e /root -e /home -e /tmp -e /var/tmp -f -
---
 > +      ${RESTORECON} -R $2 -v -e /root -e /home -e /tmp -e /var/tmp 
-e /dev -f -
185c185


Stephen Smalley wrote:

>On Wed, 2005-02-02 at 12:46, Daniel J Walsh wrote:
>  
>
>>Ok how about this patch.
>>
>>Added -e flag for restorecon
>>    
>>
>
>Merged along with the attached patch as of policycoreutils 1.21.11.
>
>  
>
>------------------------------------------------------------------------
>
>Index: policycoreutils/restorecon/restorecon.c
>===================================================================
>RCS file: /nfshome/pal/CVS/selinux-usr/policycoreutils/restorecon/restorecon.c,v
>retrieving revision 1.25
>diff -u -p -r1.25 restorecon.c
>--- policycoreutils/restorecon/restorecon.c	2 Feb 2005 18:09:33 -0000	1.25
>+++ policycoreutils/restorecon/restorecon.c	2 Feb 2005 18:19:16 -0000
>@@ -50,7 +50,7 @@ static int force=0;
> static int excludeCtr=0;
> struct edir {
> 	char *directory;
>-        int size;
>+        size_t size;
> };
> static struct edir excludeArray[MAX_EXCLUDES];
> static int add_exclude(const char *directory) {
>@@ -68,6 +68,12 @@ static int add_exclude(const char *direc
>     fprintf(stderr, "\"%s\" is not a Directory: mode %o\n", directory,sb.st_mode);
>     return 1;
>   }
>+
>+  if (excludeCtr == MAX_EXCLUDES) {
>+    fprintf(stderr, "Maximum excludes %d exceeded.\n", MAX_EXCLUDES);
>+    return 1;
>+  }
>+
>    excludeArray[excludeCtr].directory = strdup(directory);
>   if (!excludeArray[excludeCtr].directory) {
>     fprintf(stderr, "Out of memory.\n");
>@@ -75,10 +81,6 @@ static int add_exclude(const char *direc
>   }
>   excludeArray[excludeCtr++].size = strlen(directory);
> 
>-  if (excludeCtr > MAX_EXCLUDES) {
>-    fprintf(stderr, "Maximum excludes %d exceeded.\n", MAX_EXCLUDES);
>-    return 1;
>-  }
>   return 0;
> }
> static int exclude(const char *file) {
>Index: policycoreutils/setfiles/setfiles.c
>===================================================================
>RCS file: /nfshome/pal/CVS/selinux-usr/policycoreutils/setfiles/setfiles.c,v
>retrieving revision 1.30
>diff -u -p -r1.30 setfiles.c
>--- policycoreutils/setfiles/setfiles.c	2 Feb 2005 18:09:37 -0000	1.30
>+++ policycoreutils/setfiles/setfiles.c	2 Feb 2005 18:20:18 -0000
>@@ -83,7 +83,7 @@ static int force=0;
> static int excludeCtr=0;
> struct edir {
> 	char *directory;
>-        int size;
>+        size_t size;
> };
> static struct edir excludeArray[MAX_EXCLUDES];
> 
>@@ -131,6 +131,12 @@ static int add_exclude(const char *direc
> 	        fprintf(stderr, "\"%s\" is not a Directory: mode %o\n", directory,sb.st_mode);
> 	        return 1;
> 	}
>+
>+	if (excludeCtr == MAX_EXCLUDES) {
>+	        fprintf(stderr, "Maximum excludes %d exceeded.\n", MAX_EXCLUDES);
>+	        return 1;
>+	}
>+
> 	excludeArray[excludeCtr].directory = strdup(directory);
> 	if (!excludeArray[excludeCtr].directory) {
> 	        fprintf(stderr, "Out of memory.\n");
>@@ -138,10 +144,6 @@ static int add_exclude(const char *direc
> 	}
> 	excludeArray[excludeCtr++].size = strlen(directory);
> 	
>-	if (excludeCtr > MAX_EXCLUDES) {
>-	        fprintf(stderr, "Maximum excludes %d exceeded.\n", MAX_EXCLUDES);
>-	        return 1;
>-	}
> 	return 0;
> }
> 
>  
>


--
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.