Merge commit 'upstream/1.5.20'

[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 f7a94b0104c437ae4d134f51850447e0d322ec89..0e8dcf855e5227197f57d972b955eb831e2849a9 100644 (file)
--- a/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.diff
+++ b/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.diff
@@ -1,6 +1,9 @@
+If /etc/mailname is present, the hostname inside the file will be
+used, rather than calling gethostbyname() on the actual hostname
+

 --- a/init.c
 +++ b/init.c
 --- a/init.c
 +++ b/init.c

-@@ -46,6 +46,7 @@
+@@ -47,6 +47,7 @@

  #include <unistd.h>
  #include <string.h>
  #include <sys/utsname.h>
  #include <unistd.h>
  #include <string.h>
  #include <sys/utsname.h>


@@ -8,7 +11,7 @@
  #include <errno.h>
  #include <sys/wait.h>
  
  #include <errno.h>
  #include <sys/wait.h>
  

-@@ -2911,6 +2912,31 @@ static int mutt_execute_commands (LIST *
+@@ -2952,6 +2953,31 @@

    return 0;
  }
  
    return 0;
  }
  


@@ -40,7 +43,7 @@
  void mutt_init (int skip_sys_rc, LIST *commands)
  {
    struct passwd *pw;
  void mutt_init (int skip_sys_rc, LIST *commands)
  {
    struct passwd *pw;

-@@ -2982,10 +3008,25 @@ void mutt_init (int skip_sys_rc, LIST *c
+@@ -3026,10 +3052,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 */