3 files changed, 15 insertions, 11 deletions

diff --git a/debian/changelog b/debian/changelog
index 79de83f50..cc07f92d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 openssh (1:4.2p1-5) UNRELEASED; urgency=low
 
   * Add a CVE name to the 1:4.0p1-1 changelog entry.
+  * Build-depend on libselinux1-dev on armeb.
 
  -- Colin Watson <cjwatson@debian.org>  Mon,  3 Oct 2005 14:12:58 +0100
 
diff --git a/debian/control b/debian/control
index affe2e4a5..2f01c8aac 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: openssh
 Section: net
 Priority: standard
 Maintainer: Matthew Vernon <matthew@debian.org>
-Build-Depends: libwrap0-dev | libwrap-dev, zlib1g-dev | libz-dev, libssl-dev, libpam0g-dev | libpam-dev, libgnomeui-dev (>= 2.0.0) | libgnome-dev, libedit-dev, groff, debhelper (>= 3), sharutils, libselinux1-dev [alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc ppc64 s390 sparc], libkrb5-dev
+Build-Depends: libwrap0-dev | libwrap-dev, zlib1g-dev | libz-dev, libssl-dev, libpam0g-dev | libpam-dev, libgnomeui-dev (>= 2.0.0) | libgnome-dev, libedit-dev, groff, debhelper (>= 3), sharutils, libselinux1-dev [alpha amd64 arm armeb hppa i386 ia64 m68k mips mipsel powerpc ppc64 s390 sparc], libkrb5-dev
 Standards-Version: 3.6.2
 Uploaders: Colin Watson <cjwatson@debian.org>
 
diff --git a/sshconnect2.c b/sshconnect2.c
index 601a49429..579e60c1c 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -85,7 +85,7 @@ ssh_kex2(char *host, struct sockaddr *hostaddr)
         Kex *kex;
 
 #ifdef GSSAPI
-        char *orig, *gss;
+        char *orig, *gss = NULL;
         int len;
 #endif
 
@@ -93,14 +93,16 @@ ssh_kex2(char *host, struct sockaddr *hostaddr)
         xxx_hostaddr = hostaddr;
 
 #ifdef GSSAPI
-        orig = myproposal[PROPOSAL_KEX_ALGS];
-        gss = ssh_gssapi_client_mechanisms(get_canonical_hostname(1));
-        debug("Offering GSSAPI proposal: %s",gss);
-        if (gss) {
-                len = strlen(orig) + strlen(gss) + 2;
-                myproposal[PROPOSAL_KEX_ALGS] = xmalloc(len);
-                snprintf(myproposal[PROPOSAL_KEX_ALGS], len, "%s,%s", gss, 
-                    orig);
+        if (options.gss_authentication) {
+                orig = myproposal[PROPOSAL_KEX_ALGS];
+                gss = ssh_gssapi_client_mechanisms(get_canonical_hostname(1));
+                debug("Offering GSSAPI proposal: %s",gss);
+                if (gss) {
+                        len = strlen(orig) + strlen(gss) + 2;
+                        myproposal[PROPOSAL_KEX_ALGS] = xmalloc(len);
+                        snprintf(myproposal[PROPOSAL_KEX_ALGS], len, "%s,%s",
+                            gss, orig);
+                }
         }
 #endif
 
@@ -150,7 +152,8 @@ ssh_kex2(char *host, struct sockaddr *hostaddr)
         kex->kex[KEX_DH_GRP14_SHA1] = kexdh_client;
         kex->kex[KEX_DH_GEX_SHA1] = kexgex_client;
 #ifdef GSSAPI
-        kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_client;
+        if (options.gss_authentication)
+                kex->kex[KEX_GSS_GRP1_SHA1] = kexgss_client;
 #endif
         kex->client_version_string=client_version_string;
         kex->server_version_string=server_version_string;