Page MenuHomeFreeBSD
Files F161907231

D58009.diff
No OneTemporary
Actions

D58009.diff
View Options

diff --git a/usr.sbin/certctl/certctl.c b/usr.sbin/certctl/certctl.c
--- a/usr.sbin/certctl/certctl.c
+++ b/usr.sbin/certctl/certctl.c
@@ -89,15 +89,11 @@
static char *untrusted_dest;
static char *bundle_dest;
-#define SSL_PATH "/etc/ssl"
-#define TRUSTED_DIR "certs"
-#define TRUSTED_PATH SSL_PATH "/" TRUSTED_DIR
-#define UNTRUSTED_DIR "untrusted"
-#define UNTRUSTED_PATH SSL_PATH "/" UNTRUSTED_DIR
-#define LEGACY_DIR "blacklisted"
-#define LEGACY_PATH SSL_PATH "/" LEGACY_DIR
-#define BUNDLE_FILE "cert.pem"
-#define BUNDLE_PATH SSL_PATH "/" BUNDLE_FILE
+#define SSL_DIR "/etc/ssl"
+#define TRUSTED_DIR SSL_DIR "/certs"
+#define UNTRUSTED_DIR SSL_DIR "/untrusted"
+#define LEGACY_DIR SSL_DIR "/blacklisted"
+#define BUNDLE_FILE SSL_DIR "/cert.pem"
static FILE *mlf;
@@ -672,7 +668,7 @@
}
/* load legacy untrusted certs */
- path = expand_path(LEGACY_PATH);
+ path = expand_path(LEGACY_DIR);
ret = read_certs(path, &untrusted, NULL);
if (ret > 0) {
warnx("certificates found in legacy directory %s",
@@ -1045,17 +1041,17 @@
(value = getenv("CERTDESTDIR")) != NULL)
trusted_dest = normalize_path(value);
else
- trusted_dest = expand_path(TRUSTED_PATH);
+ trusted_dest = expand_path(TRUSTED_DIR);
if ((value = getenv("UNTRUSTDESTDIR")) != NULL)
untrusted_dest = normalize_path(value);
else
- untrusted_dest = expand_path(UNTRUSTED_PATH);
+ untrusted_dest = expand_path(UNTRUSTED_DIR);
if ((value = getenv("BUNDLE")) != NULL)
bundle_dest = normalize_path(value);
else
- bundle_dest = expand_path(BUNDLE_PATH);
+ bundle_dest = expand_path(BUNDLE_FILE);
info("localbase:\t%s", localbase);
info("destdir:\t%s", destdir);

File Metadata

Mime Type
text/plain
Expires
Wed, Jul 8, 10:17 PM (15 h, 36 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34631101
Default Alt Text
D58009.diff (1 KB)

Event Timeline