mirrors/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2025-11-29 14:41:09 +01:00
Code Issues Projects Releases Wiki Activity

For SSH backend, allow factory to be provided instead of Backend

Browse Source
This commit is contained in:
Vishal Nayak 2015-07-01 09:37:11 -04:00
parent b6293662f2
commit af03222a3e
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/logical/ssh/backend.go
View File

@ -7,8 +7,8 @@ import (
"github.com/hashicorp/vault/logical/framework" "github.com/hashicorp/vault/logical/framework"
) )
func Factory(map[string]string) (logical.Backend, error) { func Factory(conf *logical.BackendConfig) (logical.Backend, error) {
return Backend(), nil return Backend().Setup(conf)
} }
func Backend() *framework.Backend { func Backend() *framework.Backend {

6
builtin/logical/ssh/path_lookup.go
View File

@ -41,7 +41,11 @@ func (b *backend) pathLookupWrite(req *logical.Request, d *framework.FieldData)
return nil, err return nil, err
} }
if len(keys) == 0 { if len(keys) == 0 {
return nil, fmt.Errorf("No roles registered for IP '%s'", ip.String()) return &logical.Response{
Data: map[string]interface{}{
"roles": "",
},
}, nil
} }
var matchingRoles []string var matchingRoles []string