summaryrefslogtreecommitdiff
path: root/src/nshd
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2015-09-02 12:58:58 -0600
committerLuke Shumaker <lukeshu@sbcglobal.net>2015-09-02 12:58:58 -0600
commit1eb1677cf916c13e07f61efc464edca1c571684d (patch)
treea25a47801de93d3027cf996b51e9cc725876b7d7 /src/nshd
parent5fa621f8dfe2ccd674d8d94eb148c10b52b4fca0 (diff)
Clean up
Diffstat (limited to 'src/nshd')
-rw-r--r--src/nshd/hackers_git/hackers.go1
-rw-r--r--src/nshd/hackers_git/hackers_parse.go3
-rw-r--r--src/nshd/hackers_git/hackers_watch.go2
3 files changed, 2 insertions, 4 deletions
diff --git a/src/nshd/hackers_git/hackers.go b/src/nshd/hackers_git/hackers.go
index 5c2ebd3..5876613 100644
--- a/src/nshd/hackers_git/hackers.go
+++ b/src/nshd/hackers_git/hackers.go
@@ -11,7 +11,6 @@ import (
type user struct {
passwd nslcd_proto.Passwd
- pwhash string
groups []string
}
diff --git a/src/nshd/hackers_git/hackers_parse.go b/src/nshd/hackers_git/hackers_parse.go
index b0ed91b..b446ba1 100644
--- a/src/nshd/hackers_git/hackers_parse.go
+++ b/src/nshd/hackers_git/hackers_parse.go
@@ -101,9 +101,8 @@ func load_user_yaml(filename string) (ret user, err error) {
err = &yaml.TypeError{errs}
}
- ret.passwd.Password = "x"
+ ret.passwd.PwHash = "!"
ret.passwd.GID = usersGid
- ret.pwhash = "!"
return
}
diff --git a/src/nshd/hackers_git/hackers_watch.go b/src/nshd/hackers_git/hackers_watch.go
index 1b4f08d..a878f4c 100644
--- a/src/nshd/hackers_git/hackers_watch.go
+++ b/src/nshd/hackers_git/hackers_watch.go
@@ -68,7 +68,7 @@ func (o *Hackers) close() {
func (o *Hackers) reload() (err error) {
o.close()
- o.in_fd, err = inotify.InotifyInit() ; if err != nil { return }
+ o.in_fd, err = inotify.InotifyInit() ; if err != nil { return }
o.in_wd_home, err = o.in_fd.AddWatch("/home" , in_DIR|in_CHILD_ADD); if err != nil { return }
o.in_wd_yaml, err = o.in_fd.AddWatch(o.cfg.Yamldir, in_DIR|in_CHILD_ANY); if err != nil { return }