From 71490aebd94b28d182e3e94b14cf3714cc5381af Mon Sep 17 00:00:00 2001 From: kota kanbe Date: Thu, 17 Aug 2017 21:14:48 +0900 Subject: [PATCH] Fix sudo in deep scan of RHEL --- scan/redhat.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scan/redhat.go b/scan/redhat.go index ee68cfbc..f9243e73 100644 --- a/scan/redhat.go +++ b/scan/redhat.go @@ -173,8 +173,8 @@ func (o *redhat) checkIfSudoNoPasswd() error { // // - Deep scan mode // CentOS 6, 7 ... yum-utils -// RHEL 5 ... yum-security -// RHEL 6, 7 ... yum-utils +// RHEL 5 ... yum-security, yum-changelog +// RHEL 6, 7 ... yum-utils, yum-plugin-changelog // Amazon ... yum-utils func (o *redhat) checkDependencies() error { majorVersion, err := o.Distro.MajorVersion() @@ -306,7 +306,7 @@ func (o *redhat) scanUpdatablePackages() (models.Packages, error) { cmd += " --enablerepo=" + repo } - r := o.exec(util.PrependProxyEnv(cmd), noSudo) + r := o.exec(util.PrependProxyEnv(cmd), o.sudo()) if !r.isSuccess() { return nil, fmt.Errorf("Failed to SSH: %s", r) } @@ -421,7 +421,7 @@ func (o *redhat) getAvailableChangelogs(packNames []string) (map[string]string, cmd := `yum --color=never %s changelog all %s | grep -A 10000 '==================== Available Packages ===================='` cmd = fmt.Sprintf(cmd, yumopts, strings.Join(packNames, " ")) - r := o.exec(util.PrependProxyEnv(cmd), noSudo) + r := o.exec(util.PrependProxyEnv(cmd), o.sudo()) if !r.isSuccess(0, 1) { return nil, fmt.Errorf("Failed to SSH: %s", r) } @@ -997,7 +997,7 @@ func (o *redhat) sudo() bool { case config.Amazon, config.CentOS: return false default: - // RHEL - return true + // RHEL, Oracle + return config.Conf.Deep } }