diff options
| author | Steve Langasek <steve.langasek@canonical.com> | 2020-08-11 14:54:35 -0700 |
|---|---|---|
| committer | Steve Langasek <steve.langasek@canonical.com> | 2020-08-11 15:00:33 -0700 |
| commit | 239d9c3181694bda5a0531ac579612c46c3b4e6d (patch) | |
| tree | 43c04725cde922627215f4c32665ea832dd456d1 /modules/pam_echo/pam_echo.c | |
| parent | aa2142277bf5fb4a884c6119180e41258817705b (diff) | |
| parent | f6d08ed47a3da3c08345bce2ca366e961c52ad7c (diff) | |
| download | pam-239d9c3181694bda5a0531ac579612c46c3b4e6d.tar.gz pam-239d9c3181694bda5a0531ac579612c46c3b4e6d.tar.bz2 pam-239d9c3181694bda5a0531ac579612c46c3b4e6d.zip | |
Merge upstream version 1.4.0
Diffstat (limited to 'modules/pam_echo/pam_echo.c')
| -rw-r--r-- | modules/pam_echo/pam_echo.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/modules/pam_echo/pam_echo.c b/modules/pam_echo/pam_echo.c index 38303880..181aeb4c 100644 --- a/modules/pam_echo/pam_echo.c +++ b/modules/pam_echo/pam_echo.c @@ -52,15 +52,11 @@ #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> #include <security/pam_ext.h> +#include "pam_inline.h" static int replace_and_print (pam_handle_t *pamh, const char *mesg) @@ -150,8 +146,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. */ |