Imported Debian patch 1.6~git20131117+dfsg-1

1 files changed, 37 insertions, 13 deletions

diff --git a/debian/patches/041_hurd_maxhostnamelen b/debian/patches/041_hurd_maxhostnamelen
index c6ddb96de..886b314e3 100644
--- a/debian/patches/041_hurd_maxhostnamelen
+++ b/debian/patches/041_hurd_maxhostnamelen
@@ -1,3 +1,5 @@
+diff --git a/appl/gssmask/gssmask.c b/appl/gssmask/gssmask.c
+index 5a454fc..64de3f6 100644
 --- a/appl/gssmask/gssmask.c
 +++ b/appl/gssmask/gssmask.c
 @@ -55,7 +55,7 @@ struct client {
@@ -9,7 +11,7 @@
  };
  
  FILE *logfile;
-@@ -1097,7 +1097,7 @@ create_client(int fd, int port, const ch
+@@ -1097,7 +1097,7 @@ create_client(int fd, int port, const char *moniker)
      if (moniker) {
  	c->moniker = estrdup(moniker);
      } else {
@@ -18,6 +20,8 @@
  	gethostname(hostname, sizeof(hostname));
  	ret = asprintf(&c->moniker, "gssmask: %s:%d", hostname, port);
  	if (ret == -1)
+diff --git a/appl/kf/kfd.c b/appl/kf/kfd.c
+index 9099bab..5af66a8 100644
 --- a/appl/kf/kfd.c
 +++ b/appl/kf/kfd.c
 @@ -128,7 +128,7 @@ proto (int sock, const char *svc)
@@ -29,6 +33,8 @@
      krb5_data data;
      krb5_data remotename;
      krb5_data tk_file;
+diff --git a/appl/login/login_access.c b/appl/login/login_access.c
+index 71b1fb1..c1b2059 100644
 --- a/appl/login/login_access.c
 +++ b/appl/login/login_access.c
 @@ -163,11 +163,11 @@ list_match(char *list,
@@ -45,9 +51,11 @@
      }
      return (name);
  }
+diff --git a/appl/test/tcp_server.c b/appl/test/tcp_server.c
+index 50d1bf4..e4b4df7 100644
 --- a/appl/test/tcp_server.c
 +++ b/appl/test/tcp_server.c
-@@ -44,7 +44,7 @@ proto (int sock, const char *service)
+@@ -52,7 +52,7 @@ proto (int sock, const char *service)
      krb5_principal server;
      krb5_ticket *ticket;
      char *name;
@@ -56,9 +64,11 @@
      krb5_data packet;
      krb5_data data;
      uint32_t len, net_len;
+diff --git a/lib/gssapi/spnego/accept_sec_context.c b/lib/gssapi/spnego/accept_sec_context.c
+index 48b786c..63940c8 100644
 --- a/lib/gssapi/spnego/accept_sec_context.c
 +++ b/lib/gssapi/spnego/accept_sec_context.c
-@@ -366,7 +366,7 @@ select_mech(OM_uint32 *minor_status, Mec
+@@ -366,7 +366,7 @@ select_mech(OM_uint32 *minor_status, MechType *mechType, int verify_p,
      if (verify_p) {
  	gss_name_t name = GSS_C_NO_NAME;
  	gss_buffer_desc namebuf;
@@ -67,6 +77,8 @@
  
  	host = getenv("GSSAPI_SPNEGO_NAME");
  	if (host == NULL || issuid()) {
+diff --git a/lib/krb5/get_addrs.c b/lib/krb5/get_addrs.c
+index edb3b04..01d7d67 100644
 --- a/lib/krb5/get_addrs.c
 +++ b/lib/krb5/get_addrs.c
 @@ -47,7 +47,7 @@ static krb5_error_code
@@ -78,6 +90,8 @@
      struct hostent *hostent;
  
      if (gethostname (hostname, sizeof(hostname))) {
+diff --git a/lib/krb5/get_host_realm.c b/lib/krb5/get_host_realm.c
+index 35edaec..58fd87e 100644
 --- a/lib/krb5/get_host_realm.c
 +++ b/lib/krb5/get_host_realm.c
 @@ -93,7 +93,7 @@ dns_find_realm(krb5_context context,
@@ -89,7 +103,7 @@
      struct rk_dns_reply *r;
      const char **labels;
      char **config_labels;
-@@ -221,7 +221,7 @@ krb5_get_host_realm(krb5_context context
+@@ -218,7 +218,7 @@ krb5_get_host_realm(krb5_context context,
  		    krb5_realm **realms)
  {
      const char *host = targethost;
@@ -98,6 +112,8 @@
      krb5_error_code ret;
      int use_dns;
  
+diff --git a/lib/krb5/krbhst-test.c b/lib/krb5/krbhst-test.c
+index 873734f..8445acf 100644
 --- a/lib/krb5/krbhst-test.c
 +++ b/lib/krb5/krbhst-test.c
 @@ -85,7 +85,7 @@ main(int argc, char **argv)
@@ -109,9 +125,11 @@
  
  	for (j = 0; j < sizeof(types)/sizeof(*types); ++j) {
  	    printf ("%s for %s:\n", type_str[j], argv[i]);
+diff --git a/lib/krb5/krbhst.c b/lib/krb5/krbhst.c
+index 44689ff..e7d6cf5 100644
 --- a/lib/krb5/krbhst.c
 +++ b/lib/krb5/krbhst.c
-@@ -1020,7 +1020,7 @@ gethostlist(krb5_context context, const
+@@ -1061,7 +1061,7 @@ gethostlist(krb5_context context, const char *realm,
      krb5_error_code ret;
      int nhost = 0;
      krb5_krbhst_handle handle;
@@ -120,27 +138,29 @@
      krb5_krbhst_info *hostinfo;
  
      ret = krb5_krbhst_init(context, realm, type, &handle);
+diff --git a/lib/krb5/principal.c b/lib/krb5/principal.c
+index 27efcab..072457f 100644
 --- a/lib/krb5/principal.c
 +++ b/lib/krb5/principal.c
-@@ -1033,7 +1033,7 @@ krb5_sname_to_principal_old(krb5_context
+@@ -1050,7 +1050,7 @@ krb5_sname_to_principal_old(krb5_context context,
  			    krb5_principal *ret_princ)
  {
      krb5_error_code ret;
 -    char localhost[MAXHOSTNAMELEN];
 +    char localhost[MaxHostNameLen];
-     char **realms, *host = NULL;
+     char **realms = NULL, *host = NULL;
  
      if(type != KRB5_NT_SRV_HST && type != KRB5_NT_UNKNOWN) {
-@@ -1188,7 +1188,7 @@ krb5_sname_to_principal(krb5_context con
+@@ -1299,7 +1299,7 @@ krb5_sname_to_principal(krb5_context context,
      char *realm, *remote_host;
      krb5_error_code ret;
      register char *cp;
 -    char localname[MAXHOSTNAMELEN];
 +    char localname[MaxHostNameLen];
  
-     if ((type != KRB5_NT_UNKNOWN) &&
- 	(type != KRB5_NT_SRV_HST))
-@@ -1196,7 +1196,7 @@ krb5_sname_to_principal(krb5_context con
+     *ret_princ = NULL;
+ 
+@@ -1309,7 +1309,7 @@ krb5_sname_to_principal(krb5_context context,
  
      /* if hostname is NULL, use local hostname */
      if (!hostname) {
@@ -149,9 +169,11 @@
  	    return errno;
  	hostname = localname;
      }
+diff --git a/lib/krb5/verify_init.c b/lib/krb5/verify_init.c
+index 128502f..2171f53 100644
 --- a/lib/krb5/verify_init.c
 +++ b/lib/krb5/verify_init.c
-@@ -86,7 +86,7 @@ krb5_verify_init_creds(krb5_context cont
+@@ -89,7 +89,7 @@ krb5_verify_init_creds(krb5_context context,
      krb5_data_zero (&req);
  
      if (ap_req_server == NULL) {
@@ -160,9 +182,11 @@
  
  	if (gethostname (local_hostname, sizeof(local_hostname)) < 0) {
  	    ret = errno;
+diff --git a/lib/roken/getaddrinfo_hostspec.c b/lib/roken/getaddrinfo_hostspec.c
+index 4541219..70aca71 100644
 --- a/lib/roken/getaddrinfo_hostspec.c
 +++ b/lib/roken/getaddrinfo_hostspec.c
-@@ -45,7 +45,7 @@ roken_getaddrinfo_hostspec2(const char *
+@@ -45,7 +45,7 @@ roken_getaddrinfo_hostspec2(const char *hostspec,
  {
      const char *p;
      char portstr[NI_MAXSERV];