Changeset 2538

Timestamp:

07/16/08 15:36:51 (3 months ago)

Author:

sam

Message:

• lock.c: do not build PTY locking mechanism if PAM isn't present.

Location:

neercs/trunk

Files:

• configure.ac (modified) (2 diffs)
• src/lock.c (modified) (6 diffs)

neercs/trunk/configure.ac

@@ -38 +38 @@
 AC_CHECK_HEADERS(stdio.h pty.h sys/ioctl.h sys/ptrace.h sys/stat.h sys/syscall.h sys/user.h sys/wait.h linux/kdev_t.h linux/major.h security/pam_appl.h security/pam_misc.h)
 
-AC_CHECK_LIB(pam, pam_authenticate, PAM_LIBS="${PAM_LIBS} -lpam")
+lock=no
+AC_CHECK_LIB(pam, pam_authenticate,
+ [PAM_LIBS="${PAM_LIBS} -lpam"
+  lock=yes])
+AC_DEFINE(USE_LOCK, 1, [Locking the PTY is supported])
 AC_SUBST(PAM_LIBS)
-
 
 AC_CHECK_LIB(util, forkpty, UTIL_LIBS="${UTIL_LIBS} -lutil")
@@ -48 +51 @@
 case $target in
   i?86-*-linux-*|amd64-*-linux-*|x86_64-*-linux-*)
+    AC_DEFINE(USE_GRAB, 1, [Grabbing processes is supported])
     grab=yes ;;
   *)
-    grab=no;;
+    grab=no ;;
 esac
 AC_MSG_RESULT($grab)
-if test "$grab" = "yes"; then
-  AC_DEFINE(USE_GRAB, 1, [Grabbing processes is supported])
-fi
 
 if test "${enable_debug}" = "yes"; then

neercs/trunk/src/lock.c

@@ -23 +23 @@
 #include <sys/wait.h>
 #include <sys/types.h>
-#include <security/pam_appl.h>
-#include <security/pam_misc.h>
-#include <pwd.h>
+
+#if defined USE_LOCK
+#   include <security/pam_appl.h>
+#   include <security/pam_misc.h>
+#   include <pwd.h>
+#endif
 
 #include "neercs.h"
 
+#if defined USE_LOCK
 static int convpam(int num_msg, const struct pam_message **msg,
                    struct pam_response **resp, void *appdata_ptr);
+#endif
 
 int update_lock(int c, struct screen_list *screen_list)
 {
     int refresh = 0;
+
+#if defined USE_LOCK
     if(!screen_list->locked) return 0;
 
@@ -70 +77 @@
         }
     }
+#endif
+
     return refresh;
 }
@@ -75 +84 @@
 void draw_lock(struct screen_list *screen_list)
 {
+#if defined USE_LOCK
     unsigned int i;
     char buffer[1024];
@@ -122 +132 @@
         cucul_printf(cv, x, y, "Error : %s", screen_list->lockmsg);
     }
-}
-
-
+#endif
+}
+
+
+#if defined USE_LOCK
 
 /* FIXME, handle this without assuming this is a password auth */
@@ -155 +167 @@
     return (PAM_SUCCESS);
 }
-
+#endif
 
 int validate_lock(struct screen_list *screen_list, char *user, char *pass)
 {
+#if USE_LOCK
     int ret;
     pam_handle_t *pamh=NULL;
@@ -200 +213 @@
 
     ret = pam_end(pamh, PAM_SUCCESS);
+#endif
+
     return 1;
 }