cvsdist 06e15c6
--- policycoreutils-1.13.1/run_init/run_init.c.rhat	2004-06-02 15:20:37.000000000 -0400
cvsdist 69b87c3
+++ policycoreutils-1.13.1/run_init/run_init.c	2004-06-12 05:24:51.000000000 -0400
cvsdist 06e15c6
@@ -51,6 +51,7 @@
cvsdist 06e15c6
 #include <ctype.h>
cvsdist 06e15c6
 #include <libintl.h>
cvsdist 06e15c6
 #include <locale.h>
cvsdist 06e15c6
+#include <limits.h>
cvsdist 06e15c6
 #define _(msgid) gettext (msgid)
cvsdist 06e15c6
 #ifndef PACKAGE
cvsdist 06e15c6
 #define PACKAGE "policycoreutils"   /* the name of this package lang translation */
cvsdist 06e15c6
@@ -60,7 +61,7 @@
cvsdist 06e15c6
   where: <script> is the name of the init script to run,\n\
cvsdist 06e15c6
          <args ...> are the arguments to that script.")
cvsdist 13f2dea
 
cvsdist 06e15c6
-#define CONTEXT_FILE "/etc/security/initrc_context"
cvsdist 06e15c6
+#define CONTEXT_FILE "initrc_context"
cvsdist 06e15c6
 #ifdef USE_PAM
cvsdist 13f2dea
 
cvsdist 06e15c6
 /************************************************************************
cvsdist 06e15c6
@@ -269,10 +270,11 @@
cvsdist 06e15c6
   FILE* fp;
cvsdist 06e15c6
   char  buf[255], *bufp;
cvsdist 06e15c6
   int buf_len;
cvsdist 06e15c6
-  
cvsdist 06e15c6
-  fp = fopen(CONTEXT_FILE, "r");
cvsdist 06e15c6
+  char context_file[PATH_MAX];
cvsdist 06e15c6
+  snprintf(context_file, sizeof(context_file)-1, "%s%s", selinux_default_context_path(), CONTEXT_FILE);
cvsdist 06e15c6
+  fp = fopen(context_file, "r");
cvsdist 06e15c6
   if (!fp) {
cvsdist 06e15c6
-    fprintf(stderr, _("Could not open file %s\n"), CONTEXT_FILE);
cvsdist 06e15c6
+    fprintf(stderr, _("Could not open file %s\n"), context_file);
cvsdist 06e15c6
     return -1;
cvsdist 06e15c6
   }
cvsdist 13f2dea
 
cvsdist 06e15c6
@@ -299,7 +301,7 @@
cvsdist 06e15c6
   }
cvsdist 06e15c6
 out:
cvsdist 06e15c6
   fclose(fp);
cvsdist 06e15c6
-  fprintf(stderr, _("No context in file %s\n"), CONTEXT_FILE);
cvsdist 06e15c6
+  fprintf(stderr, _("No context in file %s\n"), context_file);
cvsdist 06e15c6
   return -1;
cvsdist 06e15c6
 
cvsdist 06e15c6
 } /* get_init_context() */
cvsdist 69b87c3
--- policycoreutils-1.13.1/restorecon/restorecon.8.rhat	2004-06-02 15:20:37.000000000 -0400
cvsdist 69b87c3
+++ policycoreutils-1.13.1/restorecon/restorecon.8	2004-06-14 11:50:57.279494592 -0400
cvsdist 69b87c3
@@ -21,7 +21,7 @@
cvsdist 69b87c3
 .SH "OPTIONS"
cvsdist 69b87c3
 .TP 
cvsdist 69b87c3
 .B \-n
cvsdist 69b87c3
-don't change any file labels.
cvsdist 69b87c3
+do not change any file labels.
cvsdist 69b87c3
 .TP 
cvsdist 69b87c3
 .B \-v
cvsdist 69b87c3
 show changes in file labels.
cvsdist 69b87c3
@@ -38,5 +38,5 @@
cvsdist 69b87c3
 
cvsdist 69b87c3
 .SH "SEE ALSO"
cvsdist 69b87c3
 .BR load_policy (8),
cvsdist 69b87c3
-.BR checkpolicy (8)
cvsdist 69b87c3
+.BR checkpolicy (8),
cvsdist 69b87c3
 .BR setfiles (8)