d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't allow upgrade to touch /usr/src; only evil can result from

Browse Source 
that kind of overlay smashing.
This commit is contained in:
Jordan K. Hubbard 1999-04-07 03:06:44 +00:00
parent a35ed6d00d
commit 9d49bf557a
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
release/sysinstall/installUpgrade.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: installUpgrade.c,v 1.64 1999/02/15 02:22:47 jkh Exp $
* $Id: installUpgrade.c,v 1.65 1999/03/19 08:22:31 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -248,6 +248,17 @@ installUpgrade(dialogMenuItem *self)
}
saved_etc[0] = '\0';
/* Don't allow sources to be upgraded unless if we have src already */
if (directory_exists("/usr/src/") && (Dists & DIST_SRC)) {
Dists &= ~DIST_SRC;
msgConfirm("Warning: /usr/src exists and sources were selected as upgrade\n"
"targets. Unfortunately, this is not the way to upgrade your\n"
"sources - please use CTM or CVSup or some other method which\n"
"handles ``deletion events'', unlike this particular feature.\n\n"
"Your existing /usr/src will not be affected by this upgrade.\n");
}
if (extractingBin) {
while (!*saved_etc) {
char *cp = msgGetInput("/usr/tmp/etc", "Under which directory do you wish to save your current /etc?");

13
usr.sbin/sysinstall/installUpgrade.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: installUpgrade.c,v 1.64 1999/02/15 02:22:47 jkh Exp $
* $Id: installUpgrade.c,v 1.65 1999/03/19 08:22:31 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -248,6 +248,17 @@ installUpgrade(dialogMenuItem *self)
}
saved_etc[0] = '\0';
/* Don't allow sources to be upgraded unless if we have src already */
if (directory_exists("/usr/src/") && (Dists & DIST_SRC)) {
Dists &= ~DIST_SRC;
msgConfirm("Warning: /usr/src exists and sources were selected as upgrade\n"
"targets. Unfortunately, this is not the way to upgrade your\n"
"sources - please use CTM or CVSup or some other method which\n"
"handles ``deletion events'', unlike this particular feature.\n\n"
"Your existing /usr/src will not be affected by this upgrade.\n");
}
if (extractingBin) {
while (!*saved_etc) {
char *cp = msgGetInput("/usr/tmp/etc", "Under which directory do you wish to save your current /etc?");