Ticket #36171: openssh.diff

net/openssh/files/apple-keychain.patch

@@ -331 +331 @@
 +       if (-1 == (ngroups = getgrouplist_2(pw->pw_name, pw->pw_gid,
 +           &groups_bygid))) {
 +               logit("getgrouplist_2 failed");
-+               return;
++               return 0;
 +       }
 +#endif
         groups_byname = xcalloc(ngroups, sizeof(*groups_byname));
@@ -342 +342 @@
 +       if (getgrouplist(pw->pw_name, pw->pw_gid, groups_bygid, &ngroups) == -1) {
 +           logit("getgrouplist: groups list too small");
 +               xfree(groups_bygid);
-+               return;
++               return 0;
 +       }
 +#endif
         for (i = 0, j = 0; i < ngroups; i++)

net/openssh/files/openssh-5.9p1-gsskex-all-20110920.patch

@@ -180 +180 @@
         loginrec.o auth-pam.o auth-shadow.o auth-sia.o md5crypt.o \
         sftp-server.o sftp-common.o \
         roaming_common.o roaming_serv.o \
-diff --git a/auth-krb5.c b/auth-krb5.c
-index d019fe2..8219133 100644
---- a/auth-krb5.c
-+++ b/auth-krb5.c
-@@ -170,8 +170,13 @@ auth_krb5_password(Authctxt *authctxt, const char *password)
+--- a/auth-krb5.c       2012-04-25 16:52:15.000000000 -0700
++++ b/auth-krb5.c       2012-09-16 22:34:03.000000000 -0700
+@@ -170,8 +170,13 @@
  
         len = strlen(authctxt->krb5_ticket_file) + 6;
         authctxt->krb5_ccname = xmalloc(len);
@@ -198 +196 @@
  
  #ifdef USE_PAM
         if (options.use_pam)
-@@ -226,15 +231,22 @@ krb5_cleanup_proc(Authctxt *authctxt)
+@@ -226,15 +231,22 @@
  #ifndef HEIMDAL
  krb5_error_code
  ssh_krb5_cc_gen(krb5_context ctx, krb5_ccache *ccache) {
--       int tmpfd, ret;
-+       int ret;
+-       int tmpfd, ret, oerrno;
++       int ret, oerrno;
         char ccname[40];
         mode_t old_umask;
 +#ifdef USE_CCAPI
@@ -222 +220 @@
 +#ifndef USE_CCAPI
         old_umask = umask(0177);
         tmpfd = mkstemp(ccname + strlen("FILE:"));
-        umask(old_umask);
-@@ -249,6 +261,7 @@ ssh_krb5_cc_gen(krb5_context ctx, krb5_ccache *ccache) {
-                return errno;
+        oerrno = errno;
+@@ -251,6 +263,7 @@
+                return oerrno;
         }
         close(tmpfd);
 +#endif