go/msteinert-go-pam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

This looks a bit better

Browse Source
This commit is contained in:
Michael Steinert
2015-03-30 18:20:09 -05:00
parent 77471e65f1
commit 3215d873b9
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
transaction.go
View File

@@ -242,6 +242,10 @@ func (t *Transaction) GetEnv(name string) string {
return C.GoString(value) return C.GoString(value)
} }
func next(p **C.char) **C.char {
return (**C.char)(unsafe.Pointer(uintptr(unsafe.Pointer(p)) + unsafe.Sizeof(p)))
}
// pam_getenvlist // pam_getenvlist
func (t *Transaction) GetEnvList() (map[string]string, error) { func (t *Transaction) GetEnvList() (map[string]string, error) {
env := make(map[string]string) env := make(map[string]string)
@@ -250,14 +254,12 @@ func (t *Transaction) GetEnvList() (map[string]string, error) {
t.status = C.PAM_BUF_ERR t.status = C.PAM_BUF_ERR
return nil, t return nil, t
} }
q := p for q := p; *q != nil; q = next(q) {
for *q != nil {
chunks := strings.SplitN(C.GoString(*q), "=", 2) chunks := strings.SplitN(C.GoString(*q), "=", 2)
if len(chunks) == 2 { if len(chunks) == 2 {
env[chunks[0]] = chunks[1] env[chunks[0]] = chunks[1]
} }
C.free(unsafe.Pointer(*q)) C.free(unsafe.Pointer(*q))
q = (**C.char)(unsafe.Pointer(uintptr(unsafe.Pointer(q)) + unsafe.Sizeof(*p)))
} }
C.free(unsafe.Pointer(p)) C.free(unsafe.Pointer(p))
return env, nil return env, nil