Skip to content
Permalink
Browse files

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
  • Loading branch information...
FiloSottile committed Jun 2, 2019
1 parent 8d9e434 commit e9f8fbcdf4d7b204018714aff5b4c2fab7228b66
Showing with 8 additions and 4 deletions.
  1. +8 −4 cert.go
12 cert.go
@@ -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) {

0 comments on commit e9f8fbc

Please sign in to comment.
You can’t perform that action at this time.