Cleanup

pam_usb/src/local.c

@@ -22,31 +22,23 @@
 #include "log.h"
 #include "conf.h"
 
-int		pusb_local_login(t_pusb_options *opts, const char *user,
-				 const char *from)
+int		pusb_local_login(t_pusb_options *opts, const char *user)
 {
   struct utmp	utsearch;
   struct utmp	*utent;
+  const char	*from;
   int		i;
 
   log_debug("Checking whether the caller is local or not...\n");
+  from = ttyname(STDIN_FILENO);
   if (!from || !(*from))
     {
-      from = ttyname(STDIN_FILENO);
-      if (!from)
-	{
-	  log_debug("Couldn't retrieve the tty name, aborting.\n");
-	  return (1);
-	}
-      if (!strncmp(from, "/dev/", strlen("/dev/")))
-	from += strlen("/dev/");
+      log_debug("Couldn't retrieve the tty name, aborting.\n");
+      return (1);
     }
+  if (!strncmp(from, "/dev/", strlen("/dev/")))
+    from += strlen("/dev/");
   log_debug("Authentication request from tty %s\n", from);
-  if (!strcmp(from, "ssh"))
-    {
-      log_debug("SSH Authentication, aborting.\n");
-      return (0);
-    }
   strncpy(utsearch.ut_line, from, sizeof(utsearch.ut_line));
   setutent();
   utent = getutline(&utsearch);

pam_usb/src/local.h

@@ -18,7 +18,6 @@
 #ifndef PUSB_LOCAL_H_
 # define PUSB_LOCAL_H_
 
-int	pusb_local_login(t_pusb_options *opts, const char *user,
-			 const char *tty);
+int	pusb_local_login(t_pusb_options *opts, const char *user);
 
 #endif /* !PUSB_LOCAL_H_ */

pam_usb/src/pam.c

@@ -67,9 +67,15 @@ int			pam_sm_authenticate(pam_handle_t *pamh, int flags,
   log_info("Authentication request for user \"%s\" (%s)\n",
 	   user, service);
 
-  if (pam_get_item(pamh, PAM_TTY, (const void **)&tty) != PAM_SUCCESS)
-    tty = NULL;
-  if (!pusb_local_login(&opts, user, tty))
+  if (pam_get_item(pamh, PAM_TTY, (const void **)&tty) == PAM_SUCCESS)
+    {
+      if (!strcmp(tty, "ssh"))
+	{
+	  log_debug("SSH Authentication, aborting.\n");
+	  return (0);
+	}
+    }
+  if (!pusb_local_login(&opts, user))
     {
       log_error("Access denied.\n");
       return (PAM_AUTH_ERR);

pam_usb/src/pusb_check.c

@@ -52,7 +52,7 @@ static int	pusb_check_perform_authentication(t_pusb_options *opts,
     }
   log_info("Authentication request for user \"%s\" (%s)\n",
 	   user, service);
-  if (!pusb_local_login(opts, user, NULL))
+  if (!pusb_local_login(opts, user))
     {
       log_error("Access denied.\n");
       return (0);