All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ivan Gyurdiev <ivg2@cornell.edu>
To: SELinux List <SELinux@tycho.nsa.gov>
Cc: Stephen Smalley <sds@tycho.nsa.gov>
Subject: Bugfix patch
Date: Wed, 15 Feb 2006 11:19:47 -0500	[thread overview]
Message-ID: <43F354A3.6000203@cornell.edu> (raw)

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

Fix bugs in recent patches (and some additional ones).
I need to be more careful.... the tests will pass usually, since I don't 
have any local customizations.



[-- Attachment #2: semanage.sepol.utils.bugfix.diff --]
[-- Type: text/x-patch, Size: 2962 bytes --]

diff -Naurp --exclude-from excludes old/libsemanage/src/semanage_store.c new/libsemanage/src/semanage_store.c
--- old/libsemanage/src/semanage_store.c	2006-02-14 23:07:09.000000000 -0500
+++ new/libsemanage/src/semanage_store.c	2006-02-15 11:10:23.000000000 -0500
@@ -102,8 +102,8 @@ static const char *semanage_sandbox_path
 	"/booleans.local",
 	"/file_contexts.local",
 	"/seusers",
-	"/users_extra.local",
 	"/users.local",
+	"/users_extra.local",
 	"/seusers.final",
 	"/users_extra",
 };
diff -Naurp --exclude-from excludes old/libsepol/src/nodes.c new/libsepol/src/nodes.c
--- old/libsepol/src/nodes.c	2006-02-14 23:07:16.000000000 -0500
+++ new/libsepol/src/nodes.c	2006-02-15 11:13:01.000000000 -0500
@@ -300,7 +300,7 @@ int sepol_node_modify(
 	const sepol_node_t* data) {
 
 	policydb_t *policydb = &p->p;
-	ocontext_t *c, *head, *prev = NULL, *node = NULL;
+	ocontext_t *node = NULL;
 
 	int proto;
 	const char *addr, *mask;
diff -Naurp --exclude-from excludes old/libsepol/src/ports.c new/libsepol/src/ports.c
--- old/libsepol/src/ports.c	2006-02-14 23:07:16.000000000 -0500
+++ new/libsepol/src/ports.c	2006-02-15 11:12:36.000000000 -0500
@@ -253,7 +253,7 @@ int sepol_port_modify(
 	const sepol_port_t* data) {
 
 	policydb_t *policydb = &p->p;
-	ocontext_t *c, *head, *prev = NULL, *port = NULL;
+	ocontext_t *port = NULL;
 
 	int low, high, proto;
 	const char* proto_str;
diff -Naurp --exclude-from excludes old/policycoreutils/semanage/semanage new/policycoreutils/semanage/semanage
--- old/policycoreutils/semanage/semanage	2006-02-14 13:48:16.000000000 -0500
+++ new/policycoreutils/semanage/semanage	2006-02-15 11:15:44.000000000 -0500
@@ -41,6 +41,7 @@ Primary Options:\n\
 	-d, --delete     Delete a OBJECT record NAME\n\
 	-m, --modify     Modify a OBJECT record NAME\n\
 	-l, --list       List the OBJECTS\n\n\
+\
 	-h, --help       Display this message\n\
 	-n, --noheading  Do not print heading when listing OBJECTS\n\n\
 \
@@ -51,8 +52,8 @@ Object-specific Options (see above):\n\
 		-d (directory) \n\
 		-c (character device) \n\
 		-b (block device) \n\
-		-d (directory) \n\
 		-s (socket) \n\
+		-l (symbolic link) \n\
 		-p (named pipe) \n\n\
 \
 	-p, --proto      Port protocol (tcp or udp)\n\
diff -Naurp --exclude-from excludes old/policycoreutils/semanage/seobject.py new/policycoreutils/semanage/seobject.py
--- old/policycoreutils/semanage/seobject.py	2006-02-14 15:03:55.000000000 -0500
+++ new/policycoreutils/semanage/seobject.py	2006-02-15 11:15:17.000000000 -0500
@@ -863,6 +863,7 @@ class fcontextRecords(semanageRecords):
 		self.file_types["block device"] = SEMANAGE_FCONTEXT_BLOCK;
 		self.file_types["-s"] = SEMANAGE_FCONTEXT_SOCK;
 		self.file_types["socket"] = SEMANAGE_FCONTEXT_SOCK;
+		self.file_types["-l"] = SEMANAGE_FCONTEXT_LINK;
 		self.file_types["symbolic link"] = SEMANAGE_FCONTEXT_LINK;
 		self.file_types["-p"] = SEMANAGE_FCONTEXT_PIPE;
 		self.file_types["named pipe"] = SEMANAGE_FCONTEXT_PIPE;

             reply	other threads:[~2006-02-15 16:19 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-02-15 16:19 Ivan Gyurdiev [this message]
2006-02-15 16:54 ` Bugfix patch Stephen Smalley

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=43F354A3.6000203@cornell.edu \
    --to=ivg2@cornell.edu \
    --cc=SELinux@tycho.nsa.gov \
    --cc=sds@tycho.nsa.gov \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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.