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