summaryrefslogtreecommitdiffstats
path: root/contrib/openpam/lib/pam_get_user.c
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2002-12-16 15:28:05 +0000
committerdes <des@FreeBSD.org>2002-12-16 15:28:05 +0000
commit9c13a1ee5f744e6c21ae65cb3ed17e00d241a72f (patch)
treeecbdd15371b5e36058a6a262d89a55baf407a91c /contrib/openpam/lib/pam_get_user.c
parent7966ff24b5238d36ecd0fce943ba5db101374b4e (diff)
parent18c136aadd659f7b141653f3f614063e70bc59eb (diff)
downloadFreeBSD-src-9c13a1ee5f744e6c21ae65cb3ed17e00d241a72f.zip
FreeBSD-src-9c13a1ee5f744e6c21ae65cb3ed17e00d241a72f.tar.gz
This commit was generated by cvs2svn to compensate for changes in r107937,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'contrib/openpam/lib/pam_get_user.c')
-rw-r--r--contrib/openpam/lib/pam_get_user.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/contrib/openpam/lib/pam_get_user.c b/contrib/openpam/lib/pam_get_user.c
index f0dc282..f35a887 100644
--- a/contrib/openpam/lib/pam_get_user.c
+++ b/contrib/openpam/lib/pam_get_user.c
@@ -31,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $P4: //depot/projects/openpam/lib/pam_get_user.c#12 $
+ * $P4: //depot/projects/openpam/lib/pam_get_user.c#13 $
*/
#include <sys/param.h>
@@ -60,12 +60,12 @@ pam_get_user(pam_handle_t *pamh,
char *resp;
int r;
+ ENTER();
if (pamh == NULL || user == NULL)
- return (PAM_SYSTEM_ERR);
-
+ RETURNC(PAM_SYSTEM_ERR);
r = pam_get_item(pamh, PAM_USER, (const void **)user);
if (r == PAM_SUCCESS)
- return (PAM_SUCCESS);
+ RETURNC(PAM_SUCCESS);
if (prompt == NULL) {
r = pam_get_item(pamh, PAM_USER_PROMPT, (const void **)&prompt);
if (r != PAM_SUCCESS || prompt == NULL)
@@ -73,12 +73,12 @@ pam_get_user(pam_handle_t *pamh,
}
r = pam_prompt(pamh, PAM_PROMPT_ECHO_ON, &resp, "%s", prompt);
if (r != PAM_SUCCESS)
- return (r);
+ RETURNC(r);
r = pam_set_item(pamh, PAM_USER, resp);
free(resp);
if (r != PAM_SUCCESS)
- return (r);
- return (pam_get_item(pamh, PAM_USER, (const void **)user));
+ RETURNC(r);
+ RETURNC(pam_get_item(pamh, PAM_USER, (const void **)user));
}
/*
OpenPOWER on IntegriCloud