Changeset 905 in openpam

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:

• . (modified) (1 prop)
• CREDITS (modified) (1 diff)
• LICENSE (modified) (1 diff)
• lib/libpam/pam_get_authtok.c (modified) (2 diffs)
• lib/libpam/pam_get_user.c (modified) (2 diffs)

branches/nooath/CREDITS

@@ -44 +44 @@
         Mikko Työläjärvi <mbsd@pacbell.net>
         Nick Hibma <nick@van-laarhoven.org>
+        Patrick Bihan-Faou <patrick-fbsd@mindstep.com>
         Robert Watson <rwatson@freebsd.org>
         Ruslan Ermilov <ru@freebsd.org>

branches/nooath/LICENSE

@@ -1 +1 @@
 
 Copyright (c) 2002-2003 Networks Associates Technology, Inc.
-Copyright (c) 2004-2012 Dag-Erling Smørgrav
+Copyright (c) 2004-2017 Dag-Erling Smørgrav
 All rights reserved.
 

branches/nooath/lib/libpam/pam_get_authtok.c

@@ -1 +1 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2014 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2017 Dag-Erling Smørgrav
  * All rights reserved.
  *
@@ -123 +123 @@
                 prompt = promptp;
         /* no prompt provided, see if there is one tucked away somewhere */
-        if (prompt == NULL)
-                if (pam_get_item(pamh, pitem, &promptp) && promptp != NULL)
+        if (prompt == NULL) {
+                r = pam_get_item(pamh, pitem, &promptp);
+                if (r == PAM_SUCCESS && promptp != NULL)
                         prompt = promptp;
+        }
         /* fall back to hardcoded default */
         if (prompt == NULL)

branches/nooath/lib/libpam/pam_get_user.c

@@ -1 +1 @@
 /*-
  * Copyright (c) 2002-2003 Networks Associates Technology, Inc.
- * Copyright (c) 2004-2011 Dag-Erling Smørgrav
+ * Copyright (c) 2004-2017 Dag-Erling Smørgrav
  * All rights reserved.
  *
@@ -79 +79 @@
                 prompt = promptp;
         /* no prompt provided, see if there is one tucked away somewhere */
-        if (prompt == NULL)
-                if (pam_get_item(pamh, PAM_USER_PROMPT, &promptp) &&
-                    promptp != NULL)
+        if (prompt == NULL) {
+                r = pam_get_item(pamh, PAM_USER_PROMPT, &promptp);
+                if (r == PAM_SUCCESS && promptp != NULL)
                         prompt = promptp;
+        }
         /* fall back to hardcoded default */
         if (prompt == NULL)