diff options
| author | Nick Thomas <nick@gitlab.com> | 2021-05-04 11:10:26 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2021-05-04 11:10:26 +0000 |
| commit | 96402afbefc3a7b849d7e3e5d29970084cb76e3b (patch) | |
| tree | 612e6b344b700bbfdf28c16e7b65ff93c1d6fcfa /internal/command/command.go | |
| parent | 27c361604a14c0113979aac3ca61daa56bf9bb56 (diff) | |
| parent | 4545fc56e23b476ca2b54cc23ec72a0aa0d7dae1 (diff) | |
| download | gitlab-shell-96402afbefc3a7b849d7e3e5d29970084cb76e3b.tar.gz | |
Merge branch '516-handle-ssl-cert-dir-correctly' into 'main'
gitlab-sshd: Respect the ssl_cert_dir config
Closes #516
See merge request gitlab-org/gitlab-shell!467
Diffstat (limited to 'internal/command/command.go')
| -rw-r--r-- | internal/command/command.go | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/internal/command/command.go b/internal/command/command.go index 97b24ba..c2709a1 100644 --- a/internal/command/command.go +++ b/internal/command/command.go @@ -2,7 +2,6 @@ package command import ( "context" - "os" "gitlab.com/gitlab-org/gitlab-shell/internal/command/authorizedkeys" "gitlab.com/gitlab-org/gitlab-shell/internal/command/authorizedprincipals" @@ -37,10 +36,6 @@ func New(e *executable.Executable, arguments []string, env sshenv.Env, config *c } if cmd := buildCommand(e, args, config, readWriter); cmd != nil { - if config.SslCertDir != "" { - os.Setenv("SSL_CERT_DIR", config.SslCertDir) - } - return cmd, nil } |