From 020dc0f6d4cb16235cfe5583bca0bce647eea821 Mon Sep 17 00:00:00 2001
From: Chris Mann <chris@lesgrandsvoisins.com>
Date: Tue, 25 Jul 2023 14:53:14 +0200
Subject: [PATCH] Fixed Change Password Bug

---
 gpas.go    | 2 +-
 home.go    | 4 ++--
 session.go | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gpas.go b/gpas.go
index 4b34ec0..415ddab 100644
--- a/gpas.go
+++ b/gpas.go
@@ -93,7 +93,7 @@ func passwordLost(user User, config *ConfigFile, ldapConn *ldap.Conn) error {
 			log.Printf(fmt.Sprintf("passwordLost 84 : %v", user))
 			// log.Printf(fmt.Sprintf("passwordLost 85 : %v", searchRes.Entries[0]))
 			// For some reason I get here even if the entry exists already
-			// return err
+			return err
 		}
 	}
 	err = passwd(user, config, ldapConn)
diff --git a/home.go b/home.go
index a364b92..827e11a 100644
--- a/home.go
+++ b/home.go
@@ -15,6 +15,7 @@ type HomePageData struct {
 }
 
 func handleHome(w http.ResponseWriter, r *http.Request) {
+	templateHome := getTemplate("home.html")
 
 	login := checkLogin(w, r)
 	if login == nil {
@@ -22,8 +23,7 @@ func handleHome(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	templateHome := getTemplate("home.html")
-	data := &HomePageData{
+	data := HomePageData{
 		Login:    login,
 		BaseDN:   config.BaseDN,
 		Org:      config.Org,
diff --git a/session.go b/session.go
index 1dfb233..a8c507a 100644
--- a/session.go
+++ b/session.go
@@ -23,6 +23,8 @@ func checkLogin(w http.ResponseWriter, r *http.Request) *LoginStatus {
 				Username: username.(string),
 				Password: password.(string),
 			}
+		} else {
+			return nil
 		}
 	}
 
@@ -30,9 +32,7 @@ func checkLogin(w http.ResponseWriter, r *http.Request) *LoginStatus {
 	if l == nil {
 		return nil
 	}
-	if login_info == nil {
-		return nil
-	}
+
 	if err != nil {
 		log.Printf("checkLogin ldapOpen : %v", err)
 		log.Printf("checkLogin ldapOpen : %v", session)