rpms/coreutils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Unbreak id (bug #217177).

Browse Source 
- Resolves: rhbz#217177
This commit is contained in:
Tim Waugh 2006-11-24 18:35:26 +00:00
parent 6071af0b79
commit add8cb4ea7
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
coreutils-selinux.patch
View File

@ -2138,8 +2138,8 @@
case_GETOPT_HELP_CHAR; case_GETOPT_HELP_CHAR;
case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
default: default:
--- coreutils-5.97/src/id.c.selinux 2006-11-17 13:56:55.000000000 +0000 --- coreutils-5.97/src/id.c 2006-11-23 17:05:07.000000000 +0000
+++ coreutils-5.97/src/id.c 2006-11-23 17:05:07.000000000 +0000 +++ coreutils-5.97/src/id.c 2006-11-24 18:29:34.000000000 +0000
@@ -37,6 +37,20 @@ @@ -37,6 +37,20 @@
int getugroups (); int getugroups ();
@ -2226,7 +2226,7 @@
- error (EXIT_FAILURE, 0, _("cannot print only user and only group")); - error (EXIT_FAILURE, 0, _("cannot print only user and only group"));
+#ifdef WITH_SELINUX +#ifdef WITH_SELINUX
+ if (argc - optind == 1) + if (argc - optind == 1)
+ error (1, 0, _("\ + if (just_context) error (1, 0, _("\
+cannot print security context when user specified")); +cannot print security context when user specified"));
+ +
+ if( just_context && !selinux_enabled) + if( just_context && !selinux_enabled)
@ -2260,9 +2260,7 @@
else else
print_full_info (argv[optind]); print_full_info (argv[optind]);
putchar ('\n'); putchar ('\n');
@@ -407,4 +464,9 @@ @@ -409,2 +466,7 @@
free (groups);
}
#endif /* HAVE_GETGROUPS */ #endif /* HAVE_GETGROUPS */
+#ifdef WITH_SELINUX +#ifdef WITH_SELINUX
+ if ( context != NULL ) { + if ( context != NULL ) {

5
coreutils.spec
View File

@ -1,7 +1,7 @@
Summary: The GNU core utilities: a set of tools commonly used in shell scripts Summary: The GNU core utilities: a set of tools commonly used in shell scripts
Name: coreutils Name: coreutils
Version: 5.97 Version: 5.97
Release: 15%{?dist} Release: 16%{?dist}
License: GPL License: GPL
Group: System Environment/Base Group: System Environment/Base
Url: http://www.gnu.org/software/coreutils/ Url: http://www.gnu.org/software/coreutils/
@ -285,6 +285,9 @@ fi
/sbin/runuser /sbin/runuser
%changelog %changelog
* Fri Nov 24 2006 Tim Waugh <twaugh@redhat.com> 5.97-16
- Unbreak id (bug #217177).
* Thu Nov 23 2006 Tim Waugh <twaugh@redhat.com> 5.97-15 * Thu Nov 23 2006 Tim Waugh <twaugh@redhat.com> 5.97-15
- Fixed stat's 'C' format specifier (bug #216676). - Fixed stat's 'C' format specifier (bug #216676).
- Misleading 'id -Z root' error message (bug #211089). - Misleading 'id -Z root' error message (bug #211089).