- (dtucker) [auth-pam.c] Add minor debugging.

diff --git a/ChangeLog b/ChangeLog
index ce1e947881d8f471a133532c2242cca7fc806ede..ccfde56236317a0500c00a37ea78c0f5a029116b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
    unexpectedly.  with & ok djm@
  - (dtucker) [auth-pam.c] Reset signal handler in pthread_cancel too, add
    test for case where cleanup has already run.
+ - (dtucker) [auth-pam.c] Add minor debugging.
 
 20040113
  - (dtucker) [auth-pam.c] Relocate struct pam_ctxt and prototypes.  No

diff --git a/auth-pam.c b/auth-pam.c
index 1a9dd4af3476fae6c2b444bcd394695c75acba25..77f8e6aedc187a32772328bc1931a812ac144eb2 100644 (file)
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -178,6 +178,7 @@ pam_getenvlist(pam_handle_t *pamh)
 void
 pam_password_change_required(int reqd)
 {
+       debug3("%s %d", __func__, reqd);
        sshpam_new_authtok_reqd = reqd;
        if (reqd) {
                no_port_forwarding_flag |= 2;
@@ -198,6 +199,8 @@ import_environments(Buffer *b)
        u_int i, num_env;
        int err;
 
+       debug3("PAM: %s entering", __func__);
+
        /* Import variables set by do_pam_account */
        sshpam_account_status = buffer_get_int(b);
        pam_password_change_required(buffer_get_int(b));
@@ -239,6 +242,7 @@ sshpam_thread_conv(int n, const struct pam_message **msg,
        struct pam_response *reply;
        int i;
 
+       debug3("PAM: %s entering, %d responses", __func__, n);
        *resp = NULL;
 
        ctxt = data;
@@ -397,6 +401,7 @@ sshpam_thread_cleanup(void)
 {
        struct pam_ctxt *ctxt = cleanup_ctxt;
 
+       debug3("PAM: %s entering", __func__);
        if (ctxt != NULL && ctxt->pam_thread != 0) {
                pthread_cancel(ctxt->pam_thread);
                pthread_join(ctxt->pam_thread, NULL);
@@ -411,6 +416,7 @@ static int
 sshpam_null_conv(int n, const struct pam_message **msg,
     struct pam_response **resp, void *data)
 {
+       debug3("PAM: %s entering, %d responses", __func__, n);
        return (PAM_CONV_ERR);
 }
 
@@ -491,6 +497,7 @@ sshpam_init_ctx(Authctxt *authctxt)
        struct pam_ctxt *ctxt;
        int socks[2];
 
+       debug3("PAM: %s entering", __func__);
        /* Refuse to start if we don't have PAM enabled */
        if (!options.use_pam)
                return NULL;
@@ -535,6 +542,7 @@ sshpam_query(void *ctx, char **name, char **info,
        char *msg;
        size_t len;
 
+       debug3("PAM: %s entering", __func__);
        buffer_init(&buffer);
        *name = xstrdup("");
        *info = xstrdup("");
@@ -601,7 +609,7 @@ sshpam_respond(void *ctx, u_int num, char **resp)
        Buffer buffer;
        struct pam_ctxt *ctxt = ctx;
 
-       debug2("PAM: %s", __func__);
+       debug2("PAM: %s entering, %d responses", __func__, num);
        switch (ctxt->pam_done) {
        case 1:
                sshpam_authenticated = 1;
@@ -630,6 +638,7 @@ sshpam_free_ctx(void *ctxtp)
 {
        struct pam_ctxt *ctxt = ctxtp;
 
+       debug3("PAM: %s entering", __func__);
        sshpam_thread_cleanup();
        xfree(ctxt);
        /*
@@ -682,7 +691,7 @@ do_pam_account(void)
                return (sshpam_account_status);
 
        sshpam_err = pam_acct_mgmt(sshpam_handle, 0);
-       debug3("%s: pam_acct_mgmt = %d", __func__, sshpam_err);
+       debug3("PAM: %s pam_acct_mgmt = %d", __func__, sshpam_err);
        
        if (sshpam_err != PAM_SUCCESS && sshpam_err != PAM_NEW_AUTHTOK_REQD) {
                sshpam_account_status = 0;