summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2001-09-02 18:46:35 +0000
committerobrien <obrien@FreeBSD.org>2001-09-02 18:46:35 +0000
commitf93277da58c25cf3295de4c7b1dd540cec0b6232 (patch)
tree33258d263f551bff6c93b9f70d4ee74ec9430a4a
parent95305447162b7052cb9ac3edcd6b82873941de24 (diff)
downloadFreeBSD-src-f93277da58c25cf3295de4c7b1dd540cec0b6232.zip
FreeBSD-src-f93277da58c25cf3295de4c7b1dd540cec0b6232.tar.gz
We are returning to the stock (6.0.7) file now.
+ The bufov vulnerability was fixed in the vendor sources. + The vendor sources are now POSIX [me harder] compliant.
-rw-r--r--contrib/amd/fixmount/fixmount.c4
-rw-r--r--contrib/amd/hlfsd/hlfsd.c12
-rw-r--r--contrib/amd/hlfsd/homedir.c4
3 files changed, 10 insertions, 10 deletions
diff --git a/contrib/amd/fixmount/fixmount.c b/contrib/amd/fixmount/fixmount.c
index 628e645..f582724 100644
--- a/contrib/amd/fixmount/fixmount.c
+++ b/contrib/amd/fixmount/fixmount.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997-1999 Erez Zadok
+ * Copyright (c) 1997-2001 Erez Zadok
* Copyright (c) 1990 Jan-Simon Pendry
* Copyright (c) 1990 Imperial College of Science, Technology & Medicine
* Copyright (c) 1990 The Regents of the University of California.
@@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
- * $Id: fixmount.c,v 1.4 1999/02/04 07:24:42 ezk Exp $
+ * $Id: fixmount.c,v 1.5.2.1 2001/01/10 03:23:32 ezk Exp $
* $FreeBSD$
*
*/
diff --git a/contrib/amd/hlfsd/hlfsd.c b/contrib/amd/hlfsd/hlfsd.c
index dc5b2ac..3601598 100644
--- a/contrib/amd/hlfsd/hlfsd.c
+++ b/contrib/amd/hlfsd/hlfsd.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997-1999 Erez Zadok
+ * Copyright (c) 1997-2001 Erez Zadok
* Copyright (c) 1989 Jan-Simon Pendry
* Copyright (c) 1989 Imperial College of Science, Technology & Medicine
* Copyright (c) 1989 The Regents of the University of California.
@@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
- * $Id: hlfsd.c,v 1.5 1999/09/08 23:36:51 ezk Exp $
+ * $Id: hlfsd.c,v 1.7.2.2 2001/01/10 03:23:35 ezk Exp $
* $FreeBSD$
*
* HLFSD was written at Columbia University Computer Science Department, by
@@ -96,11 +96,11 @@ nfstime startup;
u_short nfs_port;
/* symbol must be available always */
-#ifdef MOUNT_TABLE_ON_FILE
+#ifdef MNTTAB_FILE_NAME
char *mnttab_file_name = MNTTAB_FILE_NAME;
-#else /* not MOUNT_TABLE_ON_FILE */
+#else /* not MNTTAB_FILE_NAME */
char *mnttab_file_name = NULL;
-#endif /* not MOUNT_TABLE_ON_FILE */
+#endif /* not MNTTAB_FILE_NAME */
/* forward declarations */
void hlfsd_going_down(int rc);
@@ -948,7 +948,7 @@ fatal(char *mess)
am_get_progname(), lessmess, errno);
}
}
- plog(XLOG_FATAL, mess);
+ plog(XLOG_FATAL, "%s", mess);
hlfsd_going_down(1);
}
diff --git a/contrib/amd/hlfsd/homedir.c b/contrib/amd/hlfsd/homedir.c
index 582acc8..904e2c6 100644
--- a/contrib/amd/hlfsd/homedir.c
+++ b/contrib/amd/hlfsd/homedir.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997-1999 Erez Zadok
+ * Copyright (c) 1997-2001 Erez Zadok
* Copyright (c) 1989 Jan-Simon Pendry
* Copyright (c) 1989 Imperial College of Science, Technology & Medicine
* Copyright (c) 1989 The Regents of the University of California.
@@ -38,7 +38,7 @@
*
* %W% (Berkeley) %G%
*
- * $Id: homedir.c,v 1.4 1999/01/13 23:31:19 ezk Exp $
+ * $Id: homedir.c,v 1.5.2.1 2001/01/10 03:23:36 ezk Exp $
* $FreeBSD$
*
* HLFSD was written at Columbia University Computer Science Department, by
OpenPOWER on IntegriCloud