Fix semodule option handling

Fix semodule option handling

[Daniel J Walsh]

[-- Attachment #1: Type: text/plain, Size: 333 bytes --]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

semodule -B lksjdlj

will blow up.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org

iD8DBQFHDoGGrlYvE4MpobMRAnWHAKCWIP/cHhbcwOjyc19RSqcvW2zAkACgscin
BYK2/vMCU9tpuZH2RB3NrJ4=
=lkqh
-----END PGP SIGNATURE-----

[-- Attachment #2: diff --]
[-- Type: text/plain, Size: 972 bytes --]

diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semodule/semodule.c policycoreutils-2.0.29/semodule/semodule.c
--- nsapolicycoreutils/semodule/semodule.c	2007-09-26 19:37:44.000000000 -0400
+++ policycoreutils-2.0.29/semodule/semodule.c	2007-10-11 15:59:39.000000000 -0400
@@ -249,11 +249,12 @@
 		 * arguments as args. Will allow 'semodule -i *.pp' to
 		 * work as expected.
 		 */
-		if (commands[num_commands - 1].mode == INSTALL_M) {
+
+		if (commands && commands[num_commands - 1].mode == INSTALL_M) {
 			mode = INSTALL_M;
-		} else if (commands[num_commands - 1].mode == UPGRADE_M) {
+		} else if (commands && commands[num_commands - 1].mode == UPGRADE_M) {
 			mode = UPGRADE_M;
-		} else if (commands[num_commands - 1].mode == REMOVE_M) {
+		} else if (commands && commands[num_commands - 1].mode == REMOVE_M) {
 			mode = REMOVE_M;
 		} else {
 			fprintf(stderr, "unknown additional arguments:\n");

[-- Attachment #3: diff.sig --]
[-- Type: application/octet-stream, Size: 65 bytes --]

Re: Fix semodule option handling

[Joshua Brindle]

Daniel J Walsh wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> semodule -B lksjdlj
>
> will blow up.

Looks reasonable (even though it isn't inline)

Acked-by: Joshua Brindle <method@manicmethod.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.