Changeset 905 in openpam


Ignore:
Timestamp:
Jan 17, 2017, 3:19:56 PM (4 years ago)
Author:
Dag-Erling Smørgrav
Message:

merge r768: fix condition for using application-provided prompt

Location:
branches/nooath
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/nooath

    • Property svn:mergeinfo changed
      /trunkmerged: 902
  • branches/nooath/CREDITS

    r855 r905  
    4444        Mikko Työläjärvi <mbsd@pacbell.net>
    4545        Nick Hibma <nick@van-laarhoven.org>
     46        Patrick Bihan-Faou <patrick-fbsd@mindstep.com>
    4647        Robert Watson <rwatson@freebsd.org>
    4748        Ruslan Ermilov <ru@freebsd.org>
  • branches/nooath/LICENSE

    r807 r905  
    11
    22Copyright (c) 2002-2003 Networks Associates Technology, Inc.
    3 Copyright (c) 2004-2012 Dag-Erling Smørgrav
     3Copyright (c) 2004-2017 Dag-Erling Smørgrav
    44All rights reserved.
    55
  • branches/nooath/lib/libpam/pam_get_authtok.c

    r895 r905  
    11/*-
    22 * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
    3  * Copyright (c) 2004-2014 Dag-Erling Smørgrav
     3 * Copyright (c) 2004-2017 Dag-Erling Smørgrav
    44 * All rights reserved.
    55 *
     
    123123                prompt = promptp;
    124124        /* 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)
    127128                        prompt = promptp;
     129        }
    128130        /* fall back to hardcoded default */
    129131        if (prompt == NULL)
  • branches/nooath/lib/libpam/pam_get_user.c

    r670 r905  
    11/*-
    22 * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
    3  * Copyright (c) 2004-2011 Dag-Erling Smørgrav
     3 * Copyright (c) 2004-2017 Dag-Erling Smørgrav
    44 * All rights reserved.
    55 *
     
    7979                prompt = promptp;
    8080        /* 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                     promptp != NULL)
     81        if (prompt == NULL) {
     82                r = pam_get_item(pamh, PAM_USER_PROMPT, &promptp);
     83                if (r == PAM_SUCCESS && promptp != NULL)
    8484                        prompt = promptp;
     85        }
    8586        /* fall back to hardcoded default */
    8687        if (prompt == NULL)
Note: See TracChangeset for help on using the changeset viewer.