* Patch to getdefaultcon to print just the correct match and add verbose option
@ 2009-03-04 20:41 Daniel J Walsh
2009-05-14 20:05 ` Chad Sellers
0 siblings, 1 reply; 3+ messages in thread
From: Daniel J Walsh @ 2009-03-04 20:41 UTC (permalink / raw)
To: SE Linux
[-- Attachment #1: Type: text/plain, Size: 431 bytes --]
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
I really want to rename this to selinuxdefaultcon, which is what we ship
in Fedora.
Also exit with proper error on failure.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org
iEYEARECAAYFAkmu54AACgkQrlYvE4MpobNoZACdHgQDP2Hp/KDBpGCD7G08HjOX
p68An25Uu83SlOqjKyy9EG8ZgdIcuTCB
=L6UU
-----END PGP SIGNATURE-----
[-- Attachment #2: libselinux-getdefaultcon.patch --]
[-- Type: text/plain, Size: 1144 bytes --]
--- nsalibselinux/utils/getdefaultcon.c 2008-08-28 09:34:24.000000000 -0400
+++ libselinux-2.0.78/utils/getdefaultcon.c 2009-03-04 15:23:52.000000000 -0500
@@ -22,8 +22,9 @@
security_context_t usercon = NULL, cur_context = NULL;
char *user = NULL, *level = NULL, *role=NULL, *seuser=NULL, *dlevel=NULL;
int ret, opt;
+ int verbose = 0;
- while ((opt = getopt(argc, argv, "l:r:")) > 0) {
+ while ((opt = getopt(argc, argv, "l:r:v")) > 0) {
switch (opt) {
case 'l':
level = strdup(optarg);
@@ -31,6 +32,9 @@
case 'r':
role = strdup(optarg);
break;
+ case 'v':
+ verbose = 1;
+ break;
default:
usage(argv[0], "invalid option", 1);
}
@@ -66,9 +70,13 @@
}
if (ret < 0)
perror(argv[0]);
- else
- printf("%s: %s from %s %s %s %s -> %s\n", argv[0], user, cur_context, seuser, role, level, usercon);
-
+ else {
+ if (verbose) {
+ printf("%s: %s from %s %s %s %s -> %s\n", argv[0], user, cur_context, seuser, role, level, usercon);
+ } else {
+ printf("%s", usercon);
+ }
+ }
free(role);
free(seuser);
@@ -76,5 +84,5 @@
free(dlevel);
free(usercon);
- return 0;
+ return ret >= 0;
}
[-- Attachment #3: libselinux-getdefaultcon.patch.sig --]
[-- Type: application/pgp-signature, Size: 72 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Patch to getdefaultcon to print just the correct match and add verbose option
2009-03-04 20:41 Patch to getdefaultcon to print just the correct match and add verbose option Daniel J Walsh
@ 2009-05-14 20:05 ` Chad Sellers
2009-05-18 15:32 ` Joshua Brindle
0 siblings, 1 reply; 3+ messages in thread
From: Chad Sellers @ 2009-05-14 20:05 UTC (permalink / raw)
To: Daniel J Walsh, SE Linux
On 3/4/09 3:41 PM, "Daniel J Walsh" <dwalsh@redhat.com> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> I really want to rename this to selinuxdefaultcon, which is what we ship
> in Fedora.
>
> Also exit with proper error on failure.
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.9 (GNU/Linux)
> Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org
>
> iEYEARECAAYFAkmu54AACgkQrlYvE4MpobNoZACdHgQDP2Hp/KDBpGCD7G08HjOX
> p68An25Uu83SlOqjKyy9EG8ZgdIcuTCB
> =L6UU
> -----END PGP SIGNATURE-----
> --- nsalibselinux/utils/getdefaultcon.c 2008-08-28 09:34:24.000000000 -0400
> +++ libselinux-2.0.78/utils/getdefaultcon.c 2009-03-04 15:23:52.000000000
> -0500
> @@ -22,8 +22,9 @@
> security_context_t usercon = NULL, cur_context = NULL;
> char *user = NULL, *level = NULL, *role=NULL, *seuser=NULL, *dlevel=NULL;
> int ret, opt;
> + int verbose = 0;
>
> - while ((opt = getopt(argc, argv, "l:r:")) > 0) {
> + while ((opt = getopt(argc, argv, "l:r:v")) > 0) {
> switch (opt) {
> case 'l':
> level = strdup(optarg);
> @@ -31,6 +32,9 @@
> case 'r':
> role = strdup(optarg);
> break;
> + case 'v':
> + verbose = 1;
> + break;
> default:
> usage(argv[0], "invalid option", 1);
> }
> @@ -66,9 +70,13 @@
> }
> if (ret < 0)
> perror(argv[0]);
> - else
> - printf("%s: %s from %s %s %s %s -> %s\n", argv[0], user, cur_context,
> seuser, role, level, usercon);
> -
> + else {
> + if (verbose) {
> + printf("%s: %s from %s %s %s %s -> %s\n", argv[0], user, cur_context,
> seuser, role, level, usercon);
> + } else {
> + printf("%s", usercon);
> + }
> + }
>
> free(role);
> free(seuser);
> @@ -76,5 +84,5 @@
> free(dlevel);
> free(usercon);
>
> - return 0;
> + return ret >= 0;
> }
Looks good to me.
Acked-by: Chad Sellers <csellers@tresys.com>
--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Patch to getdefaultcon to print just the correct match and add verbose option
2009-05-14 20:05 ` Chad Sellers
@ 2009-05-18 15:32 ` Joshua Brindle
0 siblings, 0 replies; 3+ messages in thread
From: Joshua Brindle @ 2009-05-18 15:32 UTC (permalink / raw)
To: Chad Sellers; +Cc: Daniel J Walsh, SE Linux
Chad Sellers wrote:
> On 3/4/09 3:41 PM, "Daniel J Walsh" <dwalsh@redhat.com> wrote:
>
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA1
>>
>> I really want to rename this to selinuxdefaultcon, which is what we ship
>> in Fedora.
>>
>> Also exit with proper error on failure.
>> -----BEGIN PGP SIGNATURE-----
>> Version: GnuPG v1.4.9 (GNU/Linux)
>> Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org
>>
>> iEYEARECAAYFAkmu54AACgkQrlYvE4MpobNoZACdHgQDP2Hp/KDBpGCD7G08HjOX
>> p68An25Uu83SlOqjKyy9EG8ZgdIcuTCB
>> =L6UU
>> -----END PGP SIGNATURE-----
>> --- nsalibselinux/utils/getdefaultcon.c 2008-08-28 09:34:24.000000000 -0400
>> +++ libselinux-2.0.78/utils/getdefaultcon.c 2009-03-04 15:23:52.000000000
>> -0500
>> @@ -22,8 +22,9 @@
>> security_context_t usercon = NULL, cur_context = NULL;
>> char *user = NULL, *level = NULL, *role=NULL, *seuser=NULL, *dlevel=NULL;
>> int ret, opt;
>> + int verbose = 0;
>>
>> - while ((opt = getopt(argc, argv, "l:r:")) > 0) {
>> + while ((opt = getopt(argc, argv, "l:r:v")) > 0) {
>> switch (opt) {
>> case 'l':
>> level = strdup(optarg);
>> @@ -31,6 +32,9 @@
>> case 'r':
>> role = strdup(optarg);
>> break;
>> + case 'v':
>> + verbose = 1;
>> + break;
>> default:
>> usage(argv[0], "invalid option", 1);
>> }
>> @@ -66,9 +70,13 @@
>> }
>> if (ret < 0)
>> perror(argv[0]);
>> - else
>> - printf("%s: %s from %s %s %s %s -> %s\n", argv[0], user, cur_context,
>> seuser, role, level, usercon);
>> -
>> + else {
>> + if (verbose) {
>> + printf("%s: %s from %s %s %s %s -> %s\n", argv[0], user, cur_context,
>> seuser, role, level, usercon);
>> + } else {
>> + printf("%s", usercon);
>> + }
>> + }
>>
>> free(role);
>> free(seuser);
>> @@ -76,5 +84,5 @@
>> free(dlevel);
>> free(usercon);
>>
>> - return 0;
>> + return ret >= 0;
>> }
>
> Looks good to me.
>
> Acked-by: Chad Sellers <csellers@tresys.com>
>
Merged in libselinux-2.0.81
--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to majordomo@tycho.nsa.gov with
the words "unsubscribe selinux" without quotes as the message.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-05-18 15:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-03-04 20:41 Patch to getdefaultcon to print just the correct match and add verbose option Daniel J Walsh
2009-05-14 20:05 ` Chad Sellers
2009-05-18 15:32 ` Joshua Brindle
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.