From 94839658c359ccc24aa31969204474ba507c1cb5 Mon Sep 17 00:00:00 2001
From: Mattias Andrée <maandree@operamail.com>
Date: Wed, 29 Oct 2014 14:31:45 +0100
Subject: add HOOK_DENIED
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mattias Andrée <maandree@operamail.com>
---
 src/auth/crypt.c | 9 ++++-----
 src/auth/crypt.h | 2 +-
 src/auth/pam.c   | 7 +++----
 src/auth/pam.h   | 2 +-
 4 files changed, 9 insertions(+), 11 deletions(-)

(limited to 'src/auth')

diff --git a/src/auth/crypt.c b/src/auth/crypt.c
index cbd082b..ec65fc8 100644
--- a/src/auth/crypt.c
+++ b/src/auth/crypt.c
@@ -74,7 +74,7 @@ void initialise_crypt(char* remote, char* username, char* (*reader)(void))
 /**
  * Perform token authentication
  * 
- * @return  Whether the user got automatically authenticated
+ * @return  0: failed, 1: success, 2: auto-authenticated
  */
 char authenticate_crypt(void)
 {
@@ -111,11 +111,11 @@ char authenticate_crypt(void)
 #endif
   
   if (!(crypted && *crypted)) /* empty means that no passphrase is required (not even Enter) */
-    return 1;
+    return 2;
   
   entered = crypt(passphrase_reader(), crypted /* salt argument stops parsing when encrypted begins */);
   if (entered && !strcmp(entered, crypted))
-    return 0;
+    return 1;
   
   /* Clear ISIG (and everything else) to prevent the user
    * from skipping the brute force protection sleep. */
@@ -124,7 +124,6 @@ char authenticate_crypt(void)
   tcsetattr(STDIN_FILENO, TCSAFLUSH, &stty);
   
   printf("Incorrect passphrase\n");
-  sleep(FAILURE_SLEEP);
-  _exit(1);
+  return 0;
 }
 
diff --git a/src/auth/crypt.h b/src/auth/crypt.h
index 478b138..1ba7717 100644
--- a/src/auth/crypt.h
+++ b/src/auth/crypt.h
@@ -32,7 +32,7 @@ void initialise_crypt(char* remote, char* username, char* (*reader)(void));
 /**
  * Perform token authentication
  * 
- * @return  Whether the user got automatically authenticated
+ * @return  0: failed, 1: success, 2: auto-authenticated
  */
 char authenticate_crypt(void);
 
diff --git a/src/auth/pam.c b/src/auth/pam.c
index 0a08343..61ef1fe 100644
--- a/src/auth/pam.c
+++ b/src/auth/pam.c
@@ -210,7 +210,7 @@ void quit_pam(int sig)
 /**
  * Perform token authentication
  * 
- * @return  Whether the user got automatically authenticated
+ * @return  0: failed, 1: success, 2: auto-authenticated
  */
 char authenticate_pam(void)
 {
@@ -227,11 +227,10 @@ char authenticate_pam(void)
       
       printf("Incorrect passphrase\n");
       pam_end(handle, rc);
-      sleep(FAILURE_SLEEP);
-      _exit(1);
+      return 0;
     }
   
-  return auto_authenticated;
+  return auto_authenticated ? 2 : 1;
 }
 
 
diff --git a/src/auth/pam.h b/src/auth/pam.h
index 62e2a2f..86bd64f 100644
--- a/src/auth/pam.h
+++ b/src/auth/pam.h
@@ -47,7 +47,7 @@ void close_session_pam(void);
 /**
  * Perform token authentication
  * 
- * @return  Whether the user got automatically authenticated
+ * @return  0: failed, 1: success, 2: auto-authenticated
  */
 char authenticate_pam(void);
 
-- 
cgit v1.2.3-70-g09d2