38c38
< __FBSDID("$FreeBSD: head/lib/libpam/modules/pam_ssh/pam_ssh.c 89753 2002-01-24 17:26:27Z des $");
---
> __FBSDID("$FreeBSD: head/lib/libpam/modules/pam_ssh/pam_ssh.c 89760 2002-01-24 18:37:17Z markm $");
70a71,74
> static int auth_via_key(pam_handle_t *, int, const char *, const char *, const struct passwd *, const char *);
> static void key_cleanup(pam_handle_t *, void *, int);
> static void ssh_cleanup(pam_handle_t *, void *, int);
>
75,76c79,80
< void
< key_cleanup(pam_handle_t *pamh, void *data, int error_status)
---
> static void
> key_cleanup(pam_handle_t *pamh __unused, void *data, int error_status __unused)
87,88c91,92
< void
< ssh_cleanup(pam_handle_t *pamh, void *data, int error_status)
---
> static void
> ssh_cleanup(pam_handle_t *pamh __unused, void *data, int error_status __unused)
103c107
< int
---
> static int
109c113
< static int index = 0; /* for saved keys */
---
> static int indx = 0; /* for saved keys */
135c139
< if (!asprintf(&data_name, "ssh_private_key_%d", index)) {
---
> if (!asprintf(&data_name, "ssh_private_key_%d", indx)) {
147c151
< if (!asprintf(&data_name, "ssh_key_comment_%d", index)) {
---
> if (!asprintf(&data_name, "ssh_key_comment_%d", indx)) {
158c162
< ++index;
---
> ++indx;
164c168
< pam_sm_authenticate(pam_handle_t *pamh, int flags, int argc, const char **argv)
---
> pam_sm_authenticate(pam_handle_t *pamh, int flags __unused, int argc, const char **argv)
287c291
< pam_sm_setcred(pam_handle_t *pamh, int flags, int argc, const char **argv)
---
> pam_sm_setcred(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv)
299c303
< pam_sm_acct_mgmt(pam_handle_t *pamh, int flags, int argc ,const char **argv)
---
> pam_sm_acct_mgmt(pam_handle_t *pamh __unused, int flags __unused, int argc ,const char **argv)
311c315
< pam_sm_chauthtok(pam_handle_t *pamh, int flags, int argc, const char **argv)
---
> pam_sm_chauthtok(pam_handle_t *pamh __unused, int flags __unused, int argc, const char **argv)
325c329
< pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv)
---
> pam_sm_open_session(pam_handle_t *pamh, int flags __unused, int argc, const char **argv)
337c341
< int index; /* for saved keys */
---
> int indx; /* for saved keys */
339c343
< FILE *pipe; /* ssh-agent handle */
---
> FILE *lpipe; /* ssh-agent handle */
396c400
< pipe = popen(SSH_AGENT, "r");
---
> lpipe = popen(SSH_AGENT, "r");
398c402
< if (!pipe) {
---
> if (!lpipe) {
411c415
< while (fgets(env_string, sizeof env_string, pipe)) {
---
> while (fgets(env_string, sizeof env_string, lpipe)) {
424c428
< pclose(pipe);
---
> pclose(lpipe);
457c461
< retval = pclose(pipe);
---
> retval = pclose(lpipe);
491,492c495,496
< for (index = 0; ; index++) {
< if (!asprintf(&data_name, "ssh_private_key_%d", index)) {
---
> for (indx = 0; ; indx++) {
> if (!asprintf(&data_name, "ssh_private_key_%d", indx)) {
501c505
< if (!asprintf(&data_name, "ssh_key_comment_%d", index)) {
---
> if (!asprintf(&data_name, "ssh_key_comment_%d", indx)) {
523c527
< pam_sm_close_session(pam_handle_t *pamh, int flags, int argc, const char **argv)
---
> pam_sm_close_session(pam_handle_t *pamh, int flags __unused, int argc, const char **argv)