[Selinux-commits] SF.net SVN: selinux:[2929] trunk/libsemanage/src/genhomedircon.c

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

Revision: 2929
          http://selinux.svn.sourceforge.net/selinux/?rev=2929&view=rev
Author:   ssmalley
Date:     2008-07-29 12:02:36 +0000 (Tue, 29 Jul 2008)

Log Message:
-----------
Author: Daniel J Walsh
Email: dw...@re...
Subject: Critical bug in semanage
Date: Thu, 17 Jul 2008 14:47:31 -0400

homedirs in /var and /usr/local were not being matched, causing bad
context to be added.

genhomedircon porting problem.

An extra / at the end of the regex was causing the problem

Modified Paths:
--------------
    trunk/libsemanage/src/genhomedircon.c

Modified: trunk/libsemanage/src/genhomedircon.c
===================================================================
--- trunk/libsemanage/src/genhomedircon.c	2008-07-18 19:12:55 UTC (rev 2928)
+++ trunk/libsemanage/src/genhomedircon.c	2008-07-29 12:02:36 UTC (rev 2929)
@@ -192,6 +192,11 @@
 			goto done;
 	}
 
+	if (ustr_cmp_suffix_cstr_eq(expr, "/")) {
+		if (!ustr_del(&expr, 1))
+			goto done;
+	}
+
 	/* Append pattern to eat up trailing slashes */
 	if (!ustr_add_cstr(&expr, "/*$"))
 		goto done;


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