From af8ecfc12823594c9f53ab352d16e009d69917e1 Mon Sep 17 00:00:00 2001
From: "Dmitry V. Levin" <ldv@altlinux.org>
Date: Mon, 16 Mar 2020 21:02:18 +0000
Subject: modules/pam_echo: use pam_str_skip_prefix

* modules/pam_echo/pam_echo.c: Include "pam_inline.h".
(pam_echo): Use pam_str_skip_prefix instead of ugly strncmp invocations.
---
 modules/pam_echo/pam_echo.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'modules/pam_echo/pam_echo.c')

diff --git a/modules/pam_echo/pam_echo.c b/modules/pam_echo/pam_echo.c
index 38303880..bd5910b9 100644
--- a/modules/pam_echo/pam_echo.c
+++ b/modules/pam_echo/pam_echo.c
@@ -61,6 +61,7 @@
 #include <security/pam_modutil.h>
 #include <security/_pam_macros.h>
 #include <security/pam_ext.h>
+#include "pam_inline.h"
 
 static int
 replace_and_print (pam_handle_t *pamh, const char *mesg)
@@ -150,8 +151,9 @@ pam_echo (pam_handle_t *pamh, int flags, int argc, const char **argv)
 
   for (; argc-- > 0; ++argv)
     {
-      if (!strncmp (*argv, "file=", 5))
-	file = (5 + *argv);
+      const char *str = pam_str_skip_prefix(*argv, "file=");
+      if (str != NULL)
+	file = str;
     }
 
   /* No file= option, use argument for output.  */
-- 
cgit v1.2.3


From 37b5259298be9137f5b40eef16027152ddb803ff Mon Sep 17 00:00:00 2001
From: "Dmitry V. Levin" <ldv@altlinux.org>
Date: Fri, 1 May 2020 19:20:12 +0000
Subject: modules: remove PAM_SM_* macros

Starting with commit a684595c0bbd88df71285f43fb27630e3829121e aka
Linux-PAM-1.3.0~14 (Remove "--enable-static-modules" option and support
from Linux-PAM), PAM_SM_* macros have no effect.
---
 modules/pam_echo/pam_echo.c | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'modules/pam_echo/pam_echo.c')

diff --git a/modules/pam_echo/pam_echo.c b/modules/pam_echo/pam_echo.c
index bd5910b9..181aeb4c 100644
--- a/modules/pam_echo/pam_echo.c
+++ b/modules/pam_echo/pam_echo.c
@@ -52,11 +52,6 @@
 #define HOST_NAME_MAX 255
 #endif
 
-#define PAM_SM_ACCOUNT
-#define PAM_SM_AUTH
-#define PAM_SM_PASSWORD
-#define PAM_SM_SESSION
-
 #include <security/pam_modules.h>
 #include <security/pam_modutil.h>
 #include <security/_pam_macros.h>
-- 
cgit v1.2.3