* deleteall added for ports and fcontext in semanage
@ 2007-10-08 1:51 Daniel J Walsh
2007-10-11 20:28 ` Stephen Smalley
0 siblings, 1 reply; 2+ messages in thread
From: Daniel J Walsh @ 2007-10-08 1:51 UTC (permalink / raw)
To: Stephen Smalley, SE Linux
[-- Attachment #1: Type: text/plain, Size: 0 bytes --]
[-- Attachment #2: diff --]
[-- Type: text/plain, Size: 3768 bytes --]
diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.28/semanage/seobject.py
--- nsapolicycoreutils/semanage/seobject.py 2007-10-07 21:46:43.000000000 -0400
+++ policycoreutils-2.0.28/semanage/seobject.py 2007-10-05 13:10:29.000000000 -0400
@@ -139,7 +139,7 @@
translations = fd.readlines()
fd.close()
except IOError, e:
- raise ValueError(_("Unable to open %s: translations not supported on non-MLS machines: %s") % (self.filename, e) )
+ raise ValueError(_("Unable to open %s: translations not supported on non-MLS machines") % (self.filename) )
self.ddict = {}
self.comments = []
@@ -236,9 +236,6 @@
if rc < 0:
semanage_handle_destroy(self.sh)
raise ValueError(_("Could not establish semanage connection"))
- def deleteall(self):
- raise ValueError(_("Not yet implemented"))
-
class loginRecords(semanageRecords):
def __init__(self, store = ""):
@@ -779,34 +776,6 @@
semanage_port_key_free(k)
semanage_port_free(p)
- def deleteall(self):
- (rc, plist) = semanage_port_list_local(self.sh)
- if rc < 0:
- raise ValueError(_("Could not list the ports"))
-
- rc = semanage_begin_transaction(self.sh)
- if rc < 0:
- raise ValueError(_("Could not start semanage transaction"))
-
- for port in plist:
- proto = semanage_port_get_proto(port)
- proto_str = semanage_port_get_proto_str(proto)
- low = semanage_port_get_low(port)
- high = semanage_port_get_high(port)
- port_str = "%s-%s" % (low, high)
- ( k, proto_d, low, high ) = self.__genkey(port_str , proto_str)
- if rc < 0:
- raise ValueError(_("Could not create a key for %s") % port_str)
-
- rc = semanage_port_del_local(self.sh, k)
- if rc < 0:
- raise ValueError(_("Could not delete the port %s") % port_str)
- semanage_port_key_free(k)
-
- rc = semanage_commit(self.sh)
- if rc < 0:
- raise ValueError(_("Could not delete the %s") % port_str)
-
def delete(self, port, proto):
( k, proto_d, low, high ) = self.__genkey(port, proto)
(rc,exists) = semanage_port_exists(self.sh, k)
@@ -1206,32 +1175,6 @@
semanage_fcontext_key_free(k)
semanage_fcontext_free(fcontext)
- def deleteall(self):
- (rc, flist) = semanage_fcontext_list_local(self.sh)
- if rc < 0:
- raise ValueError(_("Could not list the file contexts"))
-
- rc = semanage_begin_transaction(self.sh)
- if rc < 0:
- raise ValueError(_("Could not start semanage transaction"))
-
- for fcontext in flist:
- target = semanage_fcontext_get_expr(fcontext)
- ftype = semanage_fcontext_get_type(fcontext)
- ftype_str = semanage_fcontext_get_type_str(ftype)
- (rc,k) = semanage_fcontext_key_create(self.sh, target, file_types[ftype_str])
- if rc < 0:
- raise ValueError(_("Could not create a key for %s") % target)
-
- rc = semanage_fcontext_del_local(self.sh, k)
- if rc < 0:
- raise ValueError(_("Could not delete the file context %s") % target)
- semanage_fcontext_key_free(k)
-
- rc = semanage_commit(self.sh)
- if rc < 0:
- raise ValueError(_("Could not delete the file context %s") % target)
-
def delete(self, target, ftype):
(rc,k) = semanage_fcontext_key_create(self.sh, target, file_types[ftype])
if rc < 0:
[-- Attachment #3: diff.sig --]
[-- Type: application/octet-stream, Size: 65 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: deleteall added for ports and fcontext in semanage
2007-10-08 1:51 deleteall added for ports and fcontext in semanage Daniel J Walsh
@ 2007-10-11 20:28 ` Stephen Smalley
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Smalley @ 2007-10-11 20:28 UTC (permalink / raw)
To: Daniel J Walsh; +Cc: SE Linux
On Sun, 2007-10-07 at 21:51 -0400, Daniel J Walsh wrote:
Thanks, merged (but it was reversed ;)
> plain text document attachment (diff)
> diff --exclude-from=exclude --exclude=sepolgen-1.0.10 --exclude=gui --exclude=po -N -u -r nsapolicycoreutils/semanage/seobject.py policycoreutils-2.0.28/semanage/seobject.py
> --- nsapolicycoreutils/semanage/seobject.py 2007-10-07 21:46:43.000000000 -0400
> +++ policycoreutils-2.0.28/semanage/seobject.py 2007-10-05 13:10:29.000000000 -0400
> @@ -139,7 +139,7 @@
> translations = fd.readlines()
> fd.close()
> except IOError, e:
> - raise ValueError(_("Unable to open %s: translations not supported on non-MLS machines: %s") % (self.filename, e) )
> + raise ValueError(_("Unable to open %s: translations not supported on non-MLS machines") % (self.filename) )
>
> self.ddict = {}
> self.comments = []
> @@ -236,9 +236,6 @@
> if rc < 0:
> semanage_handle_destroy(self.sh)
> raise ValueError(_("Could not establish semanage connection"))
> - def deleteall(self):
> - raise ValueError(_("Not yet implemented"))
> -
>
> class loginRecords(semanageRecords):
> def __init__(self, store = ""):
> @@ -779,34 +776,6 @@
> semanage_port_key_free(k)
> semanage_port_free(p)
>
> - def deleteall(self):
> - (rc, plist) = semanage_port_list_local(self.sh)
> - if rc < 0:
> - raise ValueError(_("Could not list the ports"))
> -
> - rc = semanage_begin_transaction(self.sh)
> - if rc < 0:
> - raise ValueError(_("Could not start semanage transaction"))
> -
> - for port in plist:
> - proto = semanage_port_get_proto(port)
> - proto_str = semanage_port_get_proto_str(proto)
> - low = semanage_port_get_low(port)
> - high = semanage_port_get_high(port)
> - port_str = "%s-%s" % (low, high)
> - ( k, proto_d, low, high ) = self.__genkey(port_str , proto_str)
> - if rc < 0:
> - raise ValueError(_("Could not create a key for %s") % port_str)
> -
> - rc = semanage_port_del_local(self.sh, k)
> - if rc < 0:
> - raise ValueError(_("Could not delete the port %s") % port_str)
> - semanage_port_key_free(k)
> -
> - rc = semanage_commit(self.sh)
> - if rc < 0:
> - raise ValueError(_("Could not delete the %s") % port_str)
> -
> def delete(self, port, proto):
> ( k, proto_d, low, high ) = self.__genkey(port, proto)
> (rc,exists) = semanage_port_exists(self.sh, k)
> @@ -1206,32 +1175,6 @@
> semanage_fcontext_key_free(k)
> semanage_fcontext_free(fcontext)
>
> - def deleteall(self):
> - (rc, flist) = semanage_fcontext_list_local(self.sh)
> - if rc < 0:
> - raise ValueError(_("Could not list the file contexts"))
> -
> - rc = semanage_begin_transaction(self.sh)
> - if rc < 0:
> - raise ValueError(_("Could not start semanage transaction"))
> -
> - for fcontext in flist:
> - target = semanage_fcontext_get_expr(fcontext)
> - ftype = semanage_fcontext_get_type(fcontext)
> - ftype_str = semanage_fcontext_get_type_str(ftype)
> - (rc,k) = semanage_fcontext_key_create(self.sh, target, file_types[ftype_str])
> - if rc < 0:
> - raise ValueError(_("Could not create a key for %s") % target)
> -
> - rc = semanage_fcontext_del_local(self.sh, k)
> - if rc < 0:
> - raise ValueError(_("Could not delete the file context %s") % target)
> - semanage_fcontext_key_free(k)
> -
> - rc = semanage_commit(self.sh)
> - if rc < 0:
> - raise ValueError(_("Could not delete the file context %s") % target)
> -
> def delete(self, target, ftype):
> (rc,k) = semanage_fcontext_key_create(self.sh, target, file_types[ftype])
> if rc < 0:
--
Stephen Smalley
National Security Agency
--
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] 2+ messages in thread
end of thread, other threads:[~2007-10-11 20:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-10-08 1:51 deleteall added for ports and fcontext in semanage Daniel J Walsh
2007-10-11 20:28 ` Stephen Smalley
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.