certinject: Fix duplicated log variable.

pull/77/head
JeremyRand 6 years ago
parent 5d508f62e2
commit 4c66b15310
No known key found for this signature in database
GPG Key ID: B3F2D165786D6570

@ -1,9 +1,12 @@
package certinject package certinject
import ( import (
"github.com/hlandau/xlog"
"gopkg.in/hlandau/easyconfig.v1/cflag" "gopkg.in/hlandau/easyconfig.v1/cflag"
) )
var log, Log = xlog.New("ncdns.certinject")
var ( var (
flagGroup = cflag.NewGroup(nil, "certstore") flagGroup = cflag.NewGroup(nil, "certstore")
nssFlag = cflag.Bool(flagGroup, "nss", false, nssExplain) nssFlag = cflag.Bool(flagGroup, "nss", false, nssExplain)

@ -2,14 +2,10 @@
package certinject package certinject
import "github.com/hlandau/xlog"
// This package is used to add and remove certificates to the system trust // This package is used to add and remove certificates to the system trust
// store. // store.
// Currently only supports NSS sqlite3 stores. // Currently only supports NSS sqlite3 stores.
var log, Log = xlog.New("ncdns.certinject")
// InjectCert injects the given cert into all configured trust stores. // InjectCert injects the given cert into all configured trust stores.
func InjectCert(derBytes []byte) { func InjectCert(derBytes []byte) {

@ -1,7 +1,6 @@
package certinject package certinject
import ( import (
"github.com/hlandau/xlog"
"gopkg.in/hlandau/easyconfig.v1/cflag" "gopkg.in/hlandau/easyconfig.v1/cflag"
) )
@ -9,8 +8,6 @@ import (
// store. // store.
// Currently only supports Windows CryptoAPI and NSS sqlite3 stores. // Currently only supports Windows CryptoAPI and NSS sqlite3 stores.
var log, Log = xlog.New("ncdns.certinject")
var ( var (
cryptoApiFlag = cflag.Bool(flagGroup, "cryptoapi", false, cryptoApiFlag = cflag.Bool(flagGroup, "cryptoapi", false,
"Synchronize TLS certs to the CryptoAPI trust store? This "+ "Synchronize TLS certs to the CryptoAPI trust store? This "+

Loading…
Cancel
Save