Mailing-List: contact commits-help@labs.apache.org; run by ezmlm
Precedence: bulk
Reply-To: labs@labs.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r744824 - /labs/orthrus/trunk/src/ui/pam/pam_orthrus.c
Date: Mon, 16 Feb 2009 06:58:16 -0000
To: commits@labs.apache.org
From: pquerna@apache.org
Message-Id: <20090216065816.9D44523889B2@eris.apache.org>

Author: pquerna
Date: Mon Feb 16 06:58:16 2009
New Revision: 744824

URL: http://svn.apache.org/viewvc?rev=744824&view=rev
Log:
Pass the password prompt to pam_get_authtok on OpenPAM.

Modified:
    labs/orthrus/trunk/src/ui/pam/pam_orthrus.c

Modified: labs/orthrus/trunk/src/ui/pam/pam_orthrus.c
URL: http://svn.apache.org/viewvc/labs/orthrus/trunk/src/ui/pam/pam_orthrus.c?rev=744824&r1=744823&r2=744824&view=diff
==============================================================================
--- labs/orthrus/trunk/src/ui/pam/pam_orthrus.c (original)
+++ labs/orthrus/trunk/src/ui/pam/pam_orthrus.c Mon Feb 16 06:58:16 2009
@@ -146,8 +146,8 @@
 
   /* TODO: Figure out prompting in the 'new' OpenPAM */
 	/* get password */
-#ifndef OPENPAM
   password_prompt = apr_psprintf(pool, "%s\nPassword:", challenge);
+#ifndef OPENPAM
 	pam_err = pam_get_item(pamh, PAM_CONV, (const void **)&conv);
 	if (pam_err != PAM_SUCCESS) {
     apr_pool_destroy(pool);
@@ -161,7 +161,7 @@
 	for (retry = 0; retry < 3; ++retry) {
 #ifdef OPENPAM
 		pam_err = pam_get_authtok(pamh, PAM_AUTHTOK,
-                              (const char **)&password, NULL);
+                              (const char **)&password, password_prompt);
 #else
 		resp = NULL;
 		pam_err = (*conv->conv)(1, &msgp, &resp, conv->appdata_ptr);


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org