diff options
author | Steve Langasek <vorlon@debian.org> | 2019-01-22 15:01:39 -0800 |
---|---|---|
committer | Steve Langasek <vorlon@debian.org> | 2019-01-22 15:02:03 -0800 |
commit | 5cd7bb4511a7c2b355a615f19a9eca193320aa3e (patch) | |
tree | ceb3e40947d1f0f4712f473e410494177d5763e0 /modules/pam_ftp/pam_ftp.c | |
parent | cfa575497a113d8da1a2c79ef028b5c9648dc136 (diff) | |
parent | f00afb1ef201b2eef7f9ddbe5a0c6ca802cf49bb (diff) | |
download | pam-5cd7bb4511a7c2b355a615f19a9eca193320aa3e.tar.gz pam-5cd7bb4511a7c2b355a615f19a9eca193320aa3e.tar.bz2 pam-5cd7bb4511a7c2b355a615f19a9eca193320aa3e.zip |
Merge upstream version 1.3.0
Diffstat (limited to 'modules/pam_ftp/pam_ftp.c')
-rw-r--r-- | modules/pam_ftp/pam_ftp.c | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/modules/pam_ftp/pam_ftp.c b/modules/pam_ftp/pam_ftp.c index 896a1dda..6b6cf2a0 100644 --- a/modules/pam_ftp/pam_ftp.c +++ b/modules/pam_ftp/pam_ftp.c @@ -81,7 +81,7 @@ static int lookup(const char *name, const char *list, const char **_user) char *list_copy, *x; char *sptr = NULL; - list_copy = x_strdup(list); + list_copy = strdup(list); x = list_copy; while (list_copy && (l = strtok_r(x, ",", &sptr))) { x = NULL; @@ -111,7 +111,7 @@ static int lookup(const char *name, const char *list, const char **_user) /* --- authentication management functions (only) --- */ -PAM_EXTERN int +int pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED, int argc, const char **argv) { @@ -210,28 +210,11 @@ pam_sm_authenticate (pam_handle_t *pamh, int flags UNUSED, } } -PAM_EXTERN int +int pam_sm_setcred (pam_handle_t *pamh UNUSED, int flags UNUSED, int argc UNUSED, const char **argv UNUSED) { return PAM_IGNORE; } - -#ifdef PAM_STATIC - -/* static module data */ - -struct pam_module _pam_ftp_modstruct = { - "pam_ftp", - pam_sm_authenticate, - pam_sm_setcred, - NULL, - NULL, - NULL, - NULL, -}; - -#endif - /* end of module definition */ |