Fix auth

hawk/app/controllers/sessions_controller.rb

@@ -43,7 +43,11 @@ def create
         end
       else
         format.html do
-          flash.now[:alert] = @session.errors.first.last
+          if Gem.loaded_specs['rails'].version >= Gem::Version.new("6.1")
+            flash.now[:alert] = @session.errors.first.message
+          else
+            flash.now[:alert] = @session.errors.first.last
+          end
           render action: 'new'
         end
         format.json do

hawk/app/models/session.rb

@@ -39,7 +39,7 @@ class Session < Tableless
       end
 
       unless $?.exitstatus == 0
-        record.errors[:base] << _("Invalid username or password")
+        record.errors.add(:base, :blank, message: "Invalid username or password")
       end
     end
   end

tools/hawk_chkpwd.c

@@ -230,11 +230,18 @@ in_haclient_grp(const char *user)
 	return 0;
 }
 
+static int
+pam_service_exists_in(const char *path, const char* name)
+{
+	char    full_path[128];
+	snprintf(full_path, sizeof(full_path), "%s%s", path, name);
+	return access(full_path, R_OK) == 0;
+}
+
 static int
 sane_pam_service(const char *name)
 {
 	const char *sp;
-	char	path[128];
 
 	if (strlen(name) > 32)
 		return 0;
@@ -243,8 +250,9 @@ sane_pam_service(const char *name)
 			return 0;
 	}
 
-	snprintf(path, sizeof(path), "/etc/pam.d/%s", name);
-	return access(path, R_OK) == 0;
+	return pam_service_exists_in("/etc/pam.d/", name)
+		|| pam_service_exists_in("/usr/bin/", name)
+		|| pam_service_exists_in("/usr/sbin/", name);
 }
 
 int