RPM Community Forums

Mailing List Message of <rpm-devel>

Re: [CVS] RPM: rpm/build/ files.c

From: Jeff Johnson <n3npq@mac.com>
Date: Tue 06 Nov 2007 - 13:00:50 CET
Message-Id: <34845A6C-7CDB-485E-BD7C-295F35FE8579@mac.com>
This assumes typeof(flp->fl_mode) == typeof(matchpathcon arg).

BTW, there's a segfault in matchpathfini() just beyond this that  
needs to be addressed.
libselinux, not rpm, problem.

73 de Jeff

On Nov 6, 2007, at 2:31 AM, Ralf S. Engelschall wrote:

>   RPM Package Manager, CVS Repository
>   http://rpm5.org/cvs/
>    
> ______________________________________________________________________ 
> ______
>
>   Server: rpm5.org                         Name:   Ralf S. Engelschall
>   Root:   /v/rpm/cvs                       Email:  rse@rpm5.org
>   Module: rpm                              Date:   06-Nov-2007  
> 08:31:54
>   Branch: HEAD                             Handle: 2007110607315400
>
>   Modified files:
>     rpm/build               files.c
>
>   Log:
>     get rid of a compiler warnings about unused variable when  
> compiling
>     under non-Linux/SELinux platforms
>
>   Summary:
>     Revision    Changes     Path
>     1.283       +1  -2      rpm/build/files.c
>    
> ______________________________________________________________________ 
> ______
>
>   patch -p0 <<'@@ .'
>   Index: rpm/build/files.c
>    
> ====================================================================== 
> ======
>   $ cvs diff -u -r1.282 -r1.283 files.c
>   --- rpm/build/files.c	4 Nov 2007 20:51:26 -0000	1.282
>   +++ rpm/build/files.c	6 Nov 2007 07:31:54 -0000	1.283
>   @@ -1594,8 +1594,7 @@
>    	/* Add file security context to package. */
>    	{
>    	    static char *nocon = "";
>   -	    mode_t fmode = flp->fl_mode;
>   -	    if (matchpathcon(flp->fileURL, fmode, &scon) || scon == NULL)
>   +	    if (matchpathcon(flp->fileURL, flp->fl_mode, &scon) || scon  
> == NULL)
>    		scon = nocon;
>
>    	    he->tag = RPMTAG_FILECONTEXTS;
>   @@ .
> ______________________________________________________________________
> RPM Package Manager                                    http://rpm5.org
> CVS Sources Repository                                rpm-cvs@rpm5.org
Received on Tue Nov 6 13:01:19 2007
Driven by Jeff Johnson and the RPM project team.
Hosted by OpenPKG and Ralf S. Engelschall.
Powered by FreeBSD and OpenPKG.