584138-mx_update_context-segfault.patch: fix a segfault due to holes in IMAP headers...

[software/mutt-debian.git] / debian / patches / debian-specific / Md.etc_mailname_gethostbyname.diff

diff --git a/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.diff b/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.diff
index 0e8dcf855e5227197f57d972b955eb831e2849a9..13a96b65cb85b213b94a6900c2515956546b88ac 100644 (file)
--- a/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.diff
+++ b/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.diff
@@ -3,16 +3,16 @@ used, rather than calling gethostbyname() on the actual hostname
 
 --- a/init.c
 +++ b/init.c
 
 --- a/init.c
 +++ b/init.c

-@@ -47,6 +47,7 @@
+@@ -48,6 +48,7 @@

  #include <unistd.h>
  #include <string.h>
  #include <sys/utsname.h>
 +#include <netdb.h>
  #include <errno.h>
  #include <sys/wait.h>
  #include <unistd.h>
  #include <string.h>
  #include <sys/utsname.h>
 +#include <netdb.h>
  #include <errno.h>
  #include <sys/wait.h>

- 
+ #include <sys/time.h>

 @@ -2952,6 +2953,31 @@
 @@ -2952,6 +2953,31 @@

-   return 0;
+   srandom(seed);

  }
  
 +int getmailname(char *s, size_t l)
  }
  
 +int getmailname(char *s, size_t l)


@@ -43,7 +43,7 @@ used, rather than calling gethostbyname() on the actual hostname
  void mutt_init (int skip_sys_rc, LIST *commands)
  {
    struct passwd *pw;
  void mutt_init (int skip_sys_rc, LIST *commands)
  {
    struct passwd *pw;

-@@ -3026,10 +3052,25 @@
+@@ -3027,10 +3053,25 @@

      Hostname = mutt_substrdup (utsname.nodename, p);
      p++;
      strfcpy (buffer, p, sizeof (buffer)); /* save the domain for below */
      Hostname = mutt_substrdup (utsname.nodename, p);
      p++;
      strfcpy (buffer, p, sizeof (buffer)); /* save the domain for below */