Working and passing tests

4 files changed, 20 insertions, 10 deletions

diff --git a/tests/scripts/autologin-guest-logout.conf b/tests/scripts/autologin-guest-logout.conf
index cb1146b5..51a6b9ac 100644
--- a/tests/scripts/autologin-guest-logout.conf
+++ b/tests/scripts/autologin-guest-logout.conf
@@ -28,12 +28,12 @@ autologin-guest=true
 # Logout of session
 #?*SESSION :50 LOGOUT
 
-# Guest account removed
-#?GUEST-ACCOUNT REMOVE USERNAME=guest-.*
-
 # X server stops
 #?XSERVER :50 TERMINATE SIGNAL=15
 
+# Guest account removed
+#?GUEST-ACCOUNT REMOVE USERNAME=guest-.*
+
 # X server starts
 #?XSERVER :50 START
 #?XSERVER :50 INDICATE-READY
diff --git a/tests/scripts/login-guest-logout.conf b/tests/scripts/login-guest-logout.conf
index 27723626..1dcf3ceb 100644
--- a/tests/scripts/login-guest-logout.conf
+++ b/tests/scripts/login-guest-logout.conf
@@ -38,12 +38,12 @@ minimum-display-number=50
 # Logout of session
 #?*SESSION :50 LOGOUT
 
-# Guest account removed
-#?GUEST-ACCOUNT REMOVE USERNAME=guest-.*
-
 # X server stops
 #?XSERVER :50 TERMINATE SIGNAL=15
 
+# Guest account removed
+#?GUEST-ACCOUNT REMOVE USERNAME=guest-.*
+
 # X server starts
 #?XSERVER :50 START
 #?XSERVER :50 INDICATE-READY
diff --git a/tests/scripts/login-remote-session.conf b/tests/scripts/login-remote-session.conf
index 6b9b67a8..b24a89f8 100644
--- a/tests/scripts/login-remote-session.conf
+++ b/tests/scripts/login-remote-session.conf
@@ -21,23 +21,30 @@ minimum-display-number=50
 #?GREETER :50 CONNECT-TO-DAEMON
 #?GREETER :50 CONNECTED-TO-DAEMON
 
+# Start remote authentication
 #?*GREETER :50 AUTHENTICATE-REMOTE SESSION=test-remote
+
+# Guest account created
+#?GUEST-ACCOUNT ADD USERNAME=guest-.*
+
+# Get remote credentials
 #?GREETER :50 SHOW-PROMPT TEXT="remote-login:"
 #?*GREETER :50 RESPOND TEXT="remote-user"
 #?GREETER :50 SHOW-PROMPT TEXT="remote-password:"
 #?*GREETER :50 RESPOND TEXT="password"
-#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=remote-user AUTHENTICATED=TRUE
+#?GREETER :50 AUTHENTICATION-COMPLETE USERNAME=guest-.* AUTHENTICATED=TRUE
 #?*GREETER :50 START-SESSION
 #?GREETER :50 TERMINATE SIGNAL=15
 
 # Session starts
-#?SESSION :50 START USER=remote-user
+#?SESSION :50 START USER=guest-.*
 #?XSERVER :50 ACCEPT-CONNECT
 #?SESSION :50 CONNECT-XSERVER
 
 # Cleanup
 #?*STOP-DAEMON
 # Don't know what order they will terminate
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
-#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15)
+#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*)
+#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*)
+#?(SESSION :50 TERMINATE SIGNAL=15|XSERVER :50 TERMINATE SIGNAL=15|GUEST-ACCOUNT REMOVE USERNAME=guest-.*)
 #?RUNNER DAEMON-EXIT STATUS=0
diff --git a/tests/src/libsystem.c b/tests/src/libsystem.c
index 693c91e1..9e137339 100644
--- a/tests/src/libsystem.c
+++ b/tests/src/libsystem.c
@@ -437,6 +437,8 @@ pam_start (const char *service_name, const char *user, const struct pam_conv *co
 
     handle->service_name = strdup (service_name);
     handle->user = user ? strdup (user) : NULL;
+    handle->authtok = NULL;
+    handle->ruser = NULL;
     handle->tty = NULL;
     handle->conversation.conv = conversation->conv;
     handle->conversation.appdata_ptr = conversation->appdata_ptr;
@@ -523,6 +525,7 @@ pam_authenticate (pam_handle_t *pamh, int flags)
             free (resp);
             return PAM_CONV_ERR;
         }
+
         if (pamh->authtok)
             free (pamh->authtok);
         pamh->authtok = strdup (resp[0].resp);