12b6a62a7a
- Update to latest from NSA - Add call to libsepol
23 lines
938 B
Diff
23 lines
938 B
Diff
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/load_policy/load_policy.c policycoreutils-1.21.20/load_policy/load_policy.c
|
|
--- nsapolicycoreutils/load_policy/load_policy.c 2005-02-22 16:37:16.000000000 -0500
|
|
+++ policycoreutils-1.21.20/load_policy/load_policy.c 2005-02-25 10:26:45.000000000 -0500
|
|
@@ -49,6 +49,7 @@
|
|
break;
|
|
case 'q':
|
|
quiet = 1;
|
|
+ sepol_debug(0);
|
|
break;
|
|
default:
|
|
usage(argv[0]);
|
|
@@ -87,7 +88,9 @@
|
|
|
|
ret = sepol_genusers(map, sb.st_size, selinux_users_path(), &data, &data_size);
|
|
if (ret < 0) {
|
|
- fprintf(stderr, _("%s: Error while setting user configuration from %s: %s\n"), argv[0], selinux_users_path(), strerror(errno));
|
|
+ /* No users file; non-fatal. */
|
|
+ if (! quiet)
|
|
+ fprintf(stderr, _("%s: Error while setting user configuration from %s/{local.users,system.users}: %s\n"), argv[0], selinux_users_path(), strerror(errno));
|
|
data = map;
|
|
data_size = sb.st_size;
|
|
}
|