From 5e7979f016d6cf1a6a050810af47c75ea16a2c9e Mon Sep 17 00:00:00 2001
From: baude <bbaude@redhat.com>
Date: Tue, 20 Feb 2018 12:09:28 -0600
Subject: Address review comments

Review comments to delete WithNoNew function and its append.

Signed-off-by: baude <bbaude@redhat.com>

Closes: #369
Approved by: rhatdan
---
 libpod/container_api.go |  3 ++-
 libpod/options.go       | 12 ------------
 2 files changed, 2 insertions(+), 13 deletions(-)

(limited to 'libpod')

diff --git a/libpod/container_api.go b/libpod/container_api.go
index f79be4ac7..eeba36a44 100644
--- a/libpod/container_api.go
+++ b/libpod/container_api.go
@@ -236,11 +236,12 @@ func (c *Container) Exec(tty, privileged bool, env, cmd []string, user string) e
 	globalOpts := runcGlobalOptions{
 		log: c.LogPath(),
 	}
+
 	execOpts := runcExecOptions{
 		capAdd:     capList,
 		pidFile:    filepath.Join(c.state.RunDir, fmt.Sprintf("%s-execpid", stringid.GenerateNonCryptoID()[:12])),
 		env:        env,
-		noNewPrivs: c.config.NoNewPrivs,
+		noNewPrivs: c.config.Spec.Process.NoNewPrivileges,
 		user:       user,
 		cwd:        c.config.Spec.Process.Cwd,
 		tty:        tty,
diff --git a/libpod/options.go b/libpod/options.go
index 6982a26c2..56e8fa203 100644
--- a/libpod/options.go
+++ b/libpod/options.go
@@ -272,18 +272,6 @@ func WithPrivileged(privileged bool) CtrCreateOption {
 	}
 }
 
-// WithNoNewPrivs sets the noNewPrivs flag in the container runtime
-func WithNoNewPrivs(noNewPrivs bool) CtrCreateOption {
-	return func(ctr *Container) error {
-		if ctr.valid {
-			return ErrCtrFinalized
-		}
-
-		ctr.config.NoNewPrivs = noNewPrivs
-		return nil
-	}
-}
-
 // WithSELinuxLabels sets the mount label for SELinux
 func WithSELinuxLabels(processLabel, mountLabel string) CtrCreateOption {
 	return func(ctr *Container) error {
-- 
cgit v1.2.3-54-g00ecf