cert: use os.Hostname for the OU, and add the long form user name

The output of the hostname command on Windows is probably UTF-16, but
instead of figuring out its edge cases, switch to the syscall on every
platform.

Fixes #96
Closes #142
This commit is contained in:
Filippo Valsorda
2019-06-02 12:15:03 +01:00
parent 8d9e434520
commit e9f8fbcdf4

12
cert.go
View File

@@ -34,12 +34,16 @@ import (
var userAndHostname string
func init() {
u, _ := user.Current()
if u != nil {
u, err := user.Current()
if err == nil {
userAndHostname = u.Username + "@"
}
hostname, _ := os.Hostname()
userAndHostname += hostname
if h, err := os.Hostname(); err == nil {
userAndHostname += h
}
if err == nil && u.Name != "" && u.Name != u.Username {
userAndHostname += " (" + u.Name + ")"
}
}
func (m *mkcert) makeCert(hosts []string) {