From: russell@coker.com.au (Russell Coker) Date: Sun, 05 Feb 2017 21:05:43 +1100 Subject: [refpolicy] [PATCH] usrmerge2 In-Reply-To: <735b11bb-58f4-84d3-6fbe-b19169e033e4@ieee.org> References: <20170110073005.zagcy5zo3dus3bgn@athena.coker.com.au> <735b11bb-58f4-84d3-6fbe-b19169e033e4@ieee.org> Message-ID: <4402118.3Y8vQpSpZU@russell.coker.com.au> To: refpolicy@oss.tresys.com List-Id: refpolicy.oss.tresys.com On Saturday, 4 February 2017 3:20:07 PM AEDT Chris PeBenito wrote: > I've merged this, but moved lines to their proper places. I found more > duplicates to remove. I also found some modules_object_t lines that > have incorrectly been in the files module for a long time. Great! I've just attached a patch that fixes some minor issues related to usrmerge that I discovered after sending the initial patch. I think I sent the second patch to the list before, but you are better with this one as it's against the latest git. -- My Main Blog http://etbe.coker.com.au/ My Documents Blog http://doc.coker.com.au/ -------------- next part -------------- A non-text attachment was scrubbed... Name: diff Type: text/x-patch Size: 3385 bytes Desc: not available Url : http://oss.tresys.com/pipermail/refpolicy/attachments/20170205/19bd2106/attachment-0001.bin