fix PAM compile errors

diff --git a/openssh/gss-serv.c b/openssh/gss-serv.c
index de0f7d589712153ebdb289b241349768abb57f12..b6b23b7d8266272f69c6c0b7f6bdb21101637637 100644 (file)
--- a/openssh/gss-serv.c
+++ b/openssh/gss-serv.c
@@ -531,6 +531,7 @@ void
 ssh_gssapi_rekey_creds() {
        int ok;
 #ifdef USE_PAM
+    int ret;
        pam_handle_t *pamh = NULL;
        struct pam_conv pamconv = {ssh_gssapi_simple_conv, NULL};
        char *envstr;

diff --git a/openssh/servconf.c b/openssh/servconf.c
index 96a27f3ab196b3b7605ca356cdbafa58b607a181..c3c44c17f9d000bc24c139b105a66456b9173b10 100644 (file)
--- a/openssh/servconf.c
+++ b/openssh/servconf.c
@@ -399,7 +399,7 @@ static struct {
        /* Portable-specific options */
 #ifdef USE_PAM
        { "usepam", sUsePAM, SSHCFG_GLOBAL },
-       { "permitpamuserchange", sPermitPAMUserChange, SSHCFG_GLOBAL }
+       { "permitpamuserchange", sPermitPAMUserChange, SSHCFG_GLOBAL },
 #else
        { "usepam", sUnsupported, SSHCFG_GLOBAL },
        { "permitpamuserchange", sUnsupported, SSHCFG_GLOBAL },