Changeset 905 in openpam
- Timestamp:
- Jan 17, 2017, 3:19:56 PM (4 years ago)
- Location:
- branches/nooath
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/nooath
-
branches/nooath/CREDITS
r855 r905 44 44 Mikko Työläjärvi <mbsd@pacbell.net> 45 45 Nick Hibma <nick@van-laarhoven.org> 46 Patrick Bihan-Faou <patrick-fbsd@mindstep.com> 46 47 Robert Watson <rwatson@freebsd.org> 47 48 Ruslan Ermilov <ru@freebsd.org> -
branches/nooath/LICENSE
r807 r905 1 1 2 2 Copyright (c) 2002-2003 Networks Associates Technology, Inc. 3 Copyright (c) 2004-201 2Dag-Erling Smørgrav3 Copyright (c) 2004-2017 Dag-Erling Smørgrav 4 4 All rights reserved. 5 5 -
branches/nooath/lib/libpam/pam_get_authtok.c
r895 r905 1 1 /*- 2 2 * Copyright (c) 2002-2003 Networks Associates Technology, Inc. 3 * Copyright (c) 2004-201 4Dag-Erling Smørgrav3 * Copyright (c) 2004-2017 Dag-Erling Smørgrav 4 4 * All rights reserved. 5 5 * … … 123 123 prompt = promptp; 124 124 /* no prompt provided, see if there is one tucked away somewhere */ 125 if (prompt == NULL) 126 if (pam_get_item(pamh, pitem, &promptp) && promptp != NULL) 125 if (prompt == NULL) { 126 r = pam_get_item(pamh, pitem, &promptp); 127 if (r == PAM_SUCCESS && promptp != NULL) 127 128 prompt = promptp; 129 } 128 130 /* fall back to hardcoded default */ 129 131 if (prompt == NULL) -
branches/nooath/lib/libpam/pam_get_user.c
r670 r905 1 1 /*- 2 2 * Copyright (c) 2002-2003 Networks Associates Technology, Inc. 3 * Copyright (c) 2004-201 1Dag-Erling Smørgrav3 * Copyright (c) 2004-2017 Dag-Erling Smørgrav 4 4 * All rights reserved. 5 5 * … … 79 79 prompt = promptp; 80 80 /* no prompt provided, see if there is one tucked away somewhere */ 81 if (prompt == NULL) 82 if (pam_get_item(pamh, PAM_USER_PROMPT, &promptp) &&83 81 if (prompt == NULL) { 82 r = pam_get_item(pamh, PAM_USER_PROMPT, &promptp); 83 if (r == PAM_SUCCESS && promptp != NULL) 84 84 prompt = promptp; 85 } 85 86 /* fall back to hardcoded default */ 86 87 if (prompt == NULL)
Note: See TracChangeset
for help on using the changeset viewer.