diff options
author | jkh <jkh@FreeBSD.org> | 2000-07-24 18:00:16 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 2000-07-24 18:00:16 +0000 |
commit | 534da91803b1bb348372556907fe53d3619da136 (patch) | |
tree | ab563ba68f1ccae5fc8117e73c5105acaeadd9d4 /usr.sbin/sysinstall/config.c | |
parent | 51ba95b82b01735087de53b8ade822544061b96d (diff) | |
download | FreeBSD-src-534da91803b1bb348372556907fe53d3619da136.zip FreeBSD-src-534da91803b1bb348372556907fe53d3619da136.tar.gz |
Terminate, with extreme prejudice, the USAResident hack which
does bad things to /etc/make.conf in certain situations. Also
soften the "don't install crypto from the USA!" messages since,
except for RSA (which is still noted), that's not so true anymore.
Diffstat (limited to 'usr.sbin/sysinstall/config.c')
-rw-r--r-- | usr.sbin/sysinstall/config.c | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c index c0320c6..9805b09 100644 --- a/usr.sbin/sysinstall/config.c +++ b/usr.sbin/sysinstall/config.c @@ -364,41 +364,6 @@ configEnvironmentResolv(char *config) } } -/* Set up the make.conf file */ -void -configMake_conf(char *config) -{ - char *lines[MAX_LINES]; - int i, nlines; - FILE *fp; - - if (!file_readable(config)) { - char *line = malloc(21); - sprintf(line, "USA_RESIDENT=%s\n", USAResident ? "YES" : "NO"); - lines[0] = line; - nlines = 1; - } - else { - nlines = readConfig(config, lines, MAX_LINES); - if (nlines == -1) - return; - for (i = 0; i < nlines; i++) { - if (!strncmp(lines[i], "USA_RESIDENT", 12)) { - free(lines[i]); - lines[i] = malloc(21); /* big enough */ - sprintf(lines[i], "USA_RESIDENT=%s\n", USAResident ? "YES" : "NO"); - } - } - } - if ((fp = fopen(config, "w")) != NULL) { - for (i = 0; i < nlines; i++) { - fprintf(fp, "%s", lines[i]); - free(lines[i]); - } - fclose(fp); - } -} - /* Version of below for dispatch routines */ int configRC(dialogMenuItem *unused) |