* Mon Jul 17 2006 Dan Walsh <dwalsh@redhat.com> 1.30.17-4

- Fix creation of restorecond pidfile
This commit is contained in:
Daniel J Walsh 2006-07-17 13:40:31 +00:00
parent 1f785c9fcf
commit 18631653f2
2 changed files with 19 additions and 3 deletions

View File

@ -28213,7 +28213,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/zu.po policycoreutils
msgstr "" msgstr ""
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.30.17/restorecond/restorecond.c diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.30.17/restorecond/restorecond.c
--- nsapolicycoreutils/restorecond/restorecond.c 2006-07-03 07:52:43.000000000 -0400 --- nsapolicycoreutils/restorecond/restorecond.c 2006-07-03 07:52:43.000000000 -0400
+++ policycoreutils-1.30.17/restorecond/restorecond.c 2006-07-17 09:09:42.000000000 -0400 +++ policycoreutils-1.30.17/restorecond/restorecond.c 2006-07-17 09:37:26.000000000 -0400
@@ -30,9 +30,10 @@ @@ -30,9 +30,10 @@
* and makes sure that there security context matches the systems defaults * and makes sure that there security context matches the systems defaults
* *
@ -28255,7 +28255,7 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.
exit(0); exit(0);
} }
@@ -449,11 +452,14 @@ @@ -449,22 +452,25 @@
if (master_fd < 0) if (master_fd < 0)
exitApp("inotify_init"); exitApp("inotify_init");
@ -28271,3 +28271,16 @@ diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.
case '?': case '?':
usage(argv[0]); usage(argv[0]);
} }
}
read_config(master_fd);
- write_pid_file();
-
if (!debug_mode)
daemon(0, 0);
+ write_pid_file();
+
while (watch(master_fd) == 0) {
};

View File

@ -5,7 +5,7 @@
Summary: SELinux policy core utilities. Summary: SELinux policy core utilities.
Name: policycoreutils Name: policycoreutils
Version: 1.30.17 Version: 1.30.17
Release: 3 Release: 4
License: GPL License: GPL
Group: System Environment/Base Group: System Environment/Base
Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz Source: http://www.nsa.gov/selinux/archives/policycoreutils-%{version}.tgz
@ -111,6 +111,9 @@ rm -rf %{buildroot}
[ -x /sbin/service ] && /sbin/service restorecond condrestart [ -x /sbin/service ] && /sbin/service restorecond condrestart
%changelog %changelog
* Mon Jul 17 2006 Dan Walsh <dwalsh@redhat.com> 1.30.17-4
- Fix creation of restorecond pidfile
* Mon Jul 17 2006 Dan Walsh <dwalsh@redhat.com> 1.30.17-3 * Mon Jul 17 2006 Dan Walsh <dwalsh@redhat.com> 1.30.17-3
- Update translations - Update translations
- Update to new GCC - Update to new GCC