From b86bedd5a65d09045d6267538ee4c9adc1ff362114bca96553a47954d32340b4 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 4 Nov 2008 16:53:47 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpmlint?expand=0&rev=27 --- CheckSUIDPermissions.py | 10 ++++++---- rpmlint.changes | 5 +++++ rpmlint.spec | 4 +++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/CheckSUIDPermissions.py b/CheckSUIDPermissions.py index ba68b7c..d7c6316 100644 --- a/CheckSUIDPermissions.py +++ b/CheckSUIDPermissions.py @@ -108,7 +108,7 @@ class SUIDCheck(AbstractCheck.AbstractCheck): o = "invalid" if type == 04: if f in self.perms: - printWarning(pkg, 'dir-without-slash', f) + printWarning(pkg, 'permissions-dir-without-slash', f) else: f += '/' @@ -131,9 +131,9 @@ class SUIDCheck(AbstractCheck.AbstractCheck): if mode&06000: msg = '%(file)s is packaged with setuid/setgid bits (0%(mode)o)' % { 'file':f, 'mode':mode } if type != 04: - printError(pkg, 'permissions-setuid-bit', msg) + printError(pkg, 'permissions-file-setuid-bit', msg) else: - printWarning(pkg, 'permissions-setuid-bit', msg) + printWarning(pkg, 'permissions-directory-setuid-bit', msg) if mode&02: printError(pkg, 'permissions-world-writable', \ @@ -162,8 +162,10 @@ remove the slash.""", """please use the %attr macro to set the correct permissions.""", 'permissions-incorrect-owner', """please use the %attr macro to set the correct ownership.""", -'permissions-setuid-bit', +'permissions-file-setuid-bit', """Please remove the setuid/setgid bits or contact security@suse.de for review.""", +'permissions-directory-setuid-bit', +"""Please contact security@suse.de for review.""", 'permissions-world-writable', """Please remove the world writable permissions or contact security@suse.de for review.""" ) diff --git a/rpmlint.changes b/rpmlint.changes index 2bf3957..e96416d 100644 --- a/rpmlint.changes +++ b/rpmlint.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 4 14:45:40 CET 2008 - lnussel@suse.de + +- generate a different error for directories with setuid/setgid bit + ------------------------------------------------------------------- Tue Oct 28 10:00:09 CET 2008 - lnussel@suse.de diff --git a/rpmlint.spec b/rpmlint.spec index e91c312..a41c833 100644 --- a/rpmlint.spec +++ b/rpmlint.spec @@ -22,7 +22,7 @@ Name: rpmlint BuildRequires: rpm-python Summary: Rpm correctness checker Version: 0.83 -Release: 42 +Release: 43 Source0: %{name}-%{version}.tar.bz2 Source1: config Source1001: config.in @@ -218,6 +218,8 @@ rm -rf $RPM_BUILD_ROOT /usr/share/man/man1/rpmlint.1.gz %changelog +* Tue Nov 04 2008 lnussel@suse.de +- generate a different error for directories with setuid/setgid bit * Tue Oct 28 2008 lnussel@suse.de - add check for /etc/permissions violations * Wed Sep 03 2008 dmueller@suse.de