[Selinux-commits] SF.net SVN: selinux: [2849] trunk/policycoreutils/semanage

[<ssm...@us...>]

Revision: 2849
          http://selinux.svn.sourceforge.net/selinux/?rev=2849&view=rev
Author:   ssmalley
Date:     2008-03-18 13:25:27 -0700 (Tue, 18 Mar 2008)

Log Message:
-----------
Author: Caleb Case
Email: cc...@tr...
Subject: policycoreutils semanage --proto --protocol inconsistent flags
Date: Tue, 18 Mar 2008 10:31:16 -0400

semanage --help indicates two conflicting ways of using the port protocol flag:

# semanage --help | grep proto
semanage port -{a|d|m} [-tr] [ -p protocol ] port | port_range
	-p, --proto      Port protocol (tcp or udp)

That is --protocol and --proto.

The code paths are similarly conflicted with --protocol as the 'valid_option', but --proto as the flag actually used in getopt. This results in --protocol not being recognized:

# semanage port -t ftp_port_t -a --protocol tcp 12345
/usr/sbin/semanage: Options Error option --protocol not recognized 

The port is not added in this case.

Using --proto instead results in a 'not valid for port objects' error, but the error is ignored and the port added:

# semanage port -t ftp_port_t -a --proto tcp 12345
--proto not valid for port objects

# semanage port -l | grep 12345
ftp_port_t                     tcp      12345, 21

The man pages for semanage are also inconsistent.

This patch resolves the inconsistency to use --proto.

Modified Paths:
--------------
    trunk/policycoreutils/semanage/semanage
    trunk/policycoreutils/semanage/semanage.8

Modified: trunk/policycoreutils/semanage/semanage
===================================================================
--- trunk/policycoreutils/semanage/semanage	2008-03-10 13:28:02 UTC (rev 2848)
+++ trunk/policycoreutils/semanage/semanage	2008-03-18 20:25:27 UTC (rev 2849)
@@ -47,7 +47,7 @@
 semanage {boolean|login|user|port|interface|fcontext|translation} -{l|D} [-n] \n\
 semanage login -{a|d|m} [-sr] login_name\n\
 semanage user -{a|d|m} [-LrRP] selinux_name\n\
-semanage port -{a|d|m} [-tr] [ -p protocol ] port | port_range\n\
+semanage port -{a|d|m} [-tr] [ -p proto ] port | port_range\n\
 semanage interface -{a|d|m} [-tr] interface_spec\n\
 semanage fcontext -{a|d|m} [-frst] file_spec\n\
 semanage translation -{a|d|m} [-T] level\n\n\
@@ -103,7 +103,7 @@
 		valid_option["user"] = []
 		valid_option["user"] += valid_everyone + [ '-L', '--level', '-r', '--range', '-R', '--roles', '-P', '--prefix' ] 
 		valid_option["port"] = []
-		valid_option["port"] += valid_everyone + [ '-t', '--type', '-r', '--range', '-p', '--protocol' ] 
+		valid_option["port"] += valid_everyone + [ '-t', '--type', '-r', '--range', '-p', '--proto' ]
 		valid_option["interface"] = []
 		valid_option["interface"] += valid_everyone + [ '-t', '--type', '-r', '--range'] 
 		valid_option["fcontext"] = []

Modified: trunk/policycoreutils/semanage/semanage.8
===================================================================
--- trunk/policycoreutils/semanage/semanage.8	2008-03-10 13:28:02 UTC (rev 2848)
+++ trunk/policycoreutils/semanage/semanage.8	2008-03-18 20:25:27 UTC (rev 2849)
@@ -9,7 +9,7 @@
 .br
 .B semanage user \-{a|d|m} [\-LrRP] selinux_name
 .br
-.B semanage port \-{a|d|m} [\-tr] [\-p protocol] port | port_range
+.B semanage port \-{a|d|m} [\-tr] [\-p proto] port | port_range
 .br
 .B semanage interface \-{a|d|m} [\-tr] interface_spec
 .br


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.