--- policycoreutils-1.15.2/scripts/fixfiles.cron.rhat	2004-07-16 14:52:18.000000000 -0400
+++ policycoreutils-1.15.2/scripts/fixfiles.cron	2004-07-20 10:49:57.000000000 -0400
@@ -16,7 +16,14 @@
     OUTFILE=`mktemp ${INVALIDFILE}.XXXXXXXXXX`  || exit 1
     /sbin/fixfiles -l /dev/null -o $OUTFILE $CRONTYPE 
     if [ -s $OUTFILE ]; then
-	mail ${MAILTO} -s "Invalid File Contexts" < $OUTFILE
+	size=`wc -l $OUTFILE | cut -d' ' -f1`
+	if [ $size -lt 100 ]; then
+	    mail ${MAILTO} -s "Invalid File Contexts" < $OUTFILE
+	    rm -f $OUTFILE
+	else
+	    mail ${MAILTO} -s "Invalid File Contexts listed in $OUTFILE" < /dev/null
+	fi
+    else
+	rm -f $OUTFILE
     fi
-    rm -f $OUTFILE
 fi
--- policycoreutils-1.15.2/scripts/fixfiles.rhat	2004-07-16 14:52:18.000000000 -0400
+++ policycoreutils-1.15.2/scripts/fixfiles	2004-07-26 14:20:08.824584240 -0400
@@ -55,7 +55,7 @@
         echo "Warning: Skipping the following R/O filesystems:"
         echo "$FILESYSTEMSRO"
     fi
-    ${SETFILES} ${OUTFILES} -v ${FC} ${FILESYSTEMSRW} 2>&1 | tee $LOGFILE
+    ${SETFILES} ${OUTFILES} -n -v ${FC} ${FILESYSTEMSRW} 2>&1 | tee $LOGFILE
 fi
 }
 
@@ -169,7 +169,7 @@
 fi
 if [ $relabelFlag = 1 ]; then
     if [ $fullFlag = 1 ]; then
-	relabelLabels $rpmFiles
+	relabel $rpmFiles
     else
 	relabelCheck $rpmFiles
     fi
--- policycoreutils-1.15.2/scripts/genhomedircon.rhat	2004-07-16 14:52:18.000000000 -0400
+++ policycoreutils-1.15.2/scripts/genhomedircon	2004-07-20 10:49:57.000000000 -0400
@@ -25,7 +25,6 @@
 import commands, sys, os, pwd, string
 
 EXCLUDE_LOGINS=["/sbin/nologin", "/bin/false"]
-STARTING_UID=100
 
 def getPrefixes():
 	ulist = pwd.getpwall()
@@ -92,6 +91,12 @@
 		print len(sys.argv)
 		usage("Incorrect parameters")
 
+	rc=commands.getstatusoutput("grep -h '^UID_MIN' /etc/login.defs | sed -e 's/^UID_MIN[^0-9]*//'")
+	if rc[0] == 0:
+		STARTING_UID=rc[1]
+	else:
+		STARTING_UID=500
+
 	FILECONTEXTDIR=sys.argv[1]
 	prefixes = getPrefixes()
 
--- policycoreutils-1.15.2/restorecon/restorecon.c.rhat	2004-07-16 14:52:18.000000000 -0400
+++ policycoreutils-1.15.2/restorecon/restorecon.c	2004-07-20 10:49:57.000000000 -0400
@@ -109,7 +109,7 @@
   int change=1;
   int verbose=0;
   int file=0;
-  char opt;
+  int opt;
   FILE *outfile=NULL;
   char buf[PATH_MAX];