Waiting for llogin?

[tpg/opendispense2.git] / src / server / handler_door.c

diff --git a/src/server/handler_door.c b/src/server/handler_door.c
index a15a433..b2c6c2b 100644 (file)
--- a/src/server/handler_door.c
+++ b/src/server/handler_door.c
@@ -17,9 +17,8 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <signal.h>
-#if !USE_POPEN
-# include <unistd.h>
-#endif
+#include <unistd.h>
+#include <sys/wait.h>
 
 #define DOOR_UNLOCKED_DELAY    10      // 10 seconds before it re-locks
 
@@ -44,8 +43,8 @@ volatile int  giDoor_ChildStatus;
 void Door_SIGCHLDHandler(int signum)
 {
        signum = 0;
-       printf("SIGCHLD\n");
        giDoor_ChildStatus ++;
+       printf("SIGCHLD: giDoor_ChildStatus = %i \n", giDoor_ChildStatus);
 }
 
 int Door_InitHandler(void)
@@ -127,13 +126,13 @@ int Door_DoDispense(int User, int Item)
        // Child process
        if( childPid == 0 )
        {
-               
                // Close write end of stdin, and set it to #0
                close(stdin_pair[1]);   dup2(stdin_pair[0], 0);
                // Close read end of stdout, and set it to #1
                close(stdout_pair[0]);  dup2(stdout_pair[1], 1);
                
-               execl("/bin/sh", "sh", "-c", "llogin door -w-", NULL);
+               //execl("/bin/sh", "sh", "-c", "llogin door -w-", NULL);
+               execl("/usr/bin/llogin", "llogin" "door" "-w-", NULL);
                perror("execl");
                exit(-1);
        }
@@ -142,17 +141,30 @@ int Door_DoDispense(int User, int Item)
        close(stdin_pair[0]);   // child stdin read
        close(stdout_pair[1]);  // child stdout write
        
-       if( giDoor_ChildStatus || read(stdout_pair[0], buf, 512) < 0) {
+       {
+                int    len;
+               if( giDoor_ChildStatus || (len = read(stdout_pair[0], buf, 512)) < 0)
+               {
+                       #if DEBUG
+                       int child_exit;
+                       waitpid(childPid, &child_exit, 0);
+                       printf("Door_DoDispense: fread fail (child status %i)\n", child_exit);
+                       #endif
+                       return -1;
+               }
+               buf[len] = '\0';
+               
                #if DEBUG
-               printf("Door_DoDispense: fread fail\n");
+               printf("Door_DoDispense: buf = %i '%s'\n", len, buf);
                #endif
-               return -1;
        }
        
        // Send password
        if( giDoor_ChildStatus || fputs(gsDoor_Password, child_stdin) <= 0 ) {
                #if DEBUG
-               printf("Door_DoDispense: fputs password\n");
+               int child_exit;
+               waitpid(childPid, &child_exit, 0);
+               printf("Door_DoDispense: fputs password fail (child status %i)\n", child_exit);
                #endif
                return -1;
        }
@@ -179,8 +191,8 @@ int Door_DoDispense(int User, int Item)
        printf("Door_DoDispense: Door re-lock\n");
        #endif
 
-       // Re-lock the door
-       if( giDoor_ChildStatus || fputs("ATH0\n", child_stdin) == 0 ) {
+       // Re-lock the door (and quit llogin)
+       if( giDoor_ChildStatus || fputs("ATH0\n\x1D", child_stdin) == 0 ) {
                #if DEBUG
                printf("Door_DoDispense: fputs lock\n");
                #endif
@@ -195,6 +207,8 @@ int Door_DoDispense(int User, int Item)
        printf("Door_DoDispense: User %i opened door\n", User);
        #endif
 
+       kill(childPid, SIGKILL);
+
        return 0;
 }