summaryrefslogtreecommitdiff
path: root/mail/mutt14/files/patch-init.c
diff options
context:
space:
mode:
authorcvs2svn <cvs2svn@FreeBSD.org>2005-10-16 07:41:55 +0000
committercvs2svn <cvs2svn@FreeBSD.org>2005-10-16 07:41:55 +0000
commit40a3261d1a6e2617f6afde0cd6d762a7e211af7a (patch)
treed70bbf882801af3a4e58dde3ed6a1da1849479d4 /mail/mutt14/files/patch-init.c
parentFix the string format vulnerability desribed at (diff)
This commit was manufactured by cvs2svn to create tag 'RELEASE_6_0_0'.release/6.0.0
Diffstat (limited to 'mail/mutt14/files/patch-init.c')
-rw-r--r--mail/mutt14/files/patch-init.c39
1 files changed, 0 insertions, 39 deletions
diff --git a/mail/mutt14/files/patch-init.c b/mail/mutt14/files/patch-init.c
deleted file mode 100644
index 389b682cfa11..000000000000
--- a/mail/mutt14/files/patch-init.c
+++ /dev/null
@@ -1,39 +0,0 @@
---- init.c.orig Wed Jul 24 10:41:29 2002
-+++ init.c Sat May 3 08:46:29 2003
-@@ -1707,7 +1707,11 @@
- void mutt_init (int skip_sys_rc, LIST *commands)
- {
- struct passwd *pw;
-+#if __FreeBSD_version < 500000
-+ char nodename[STRING];
-+#else
- struct utsname utsname;
-+#endif
- char *p, buffer[STRING], error[STRING];
- int i, default_rc = 0, need_pause = 0;
- BUFFER err;
-@@ -1765,16 +1769,21 @@
- #endif
-
- /* And about the host... */
-+#if __FreeBSD_version < 500000
-+ gethostname(nodename, sizeof (nodename));
-+#else
- uname (&utsname);
-+ strfcpy (nodename, utsname.nodename, sizeof (nodename));
-+#endif
- /* some systems report the FQDN instead of just the hostname */
-- if ((p = strchr (utsname.nodename, '.')))
-+ if ((p = strchr (nodename, '.')))
- {
-- Hostname = mutt_substrdup (utsname.nodename, p);
-+ Hostname = mutt_substrdup (nodename, p);
- p++;
- strfcpy (buffer, p, sizeof (buffer)); /* save the domain for below */
- }
- else
-- Hostname = safe_strdup (utsname.nodename);
-+ Hostname = safe_strdup (nodename);
-
- #ifndef DOMAIN
- #define DOMAIN buffer