1 files changed, 53 insertions, 1 deletions

diff --git a/hostfile.c b/hostfile.c
index a4a355972..936d8c9be 100644
--- a/hostfile.c
+++ b/hostfile.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: hostfile.c,v 1.79 2020/03/06 18:25:12 markus Exp $ */
+/* $OpenBSD: hostfile.c,v 1.82 2020/06/26 05:42:16 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -57,6 +57,7 @@
 #include "hostfile.h"
 #include "log.h"
 #include "misc.h"
+#include "pathnames.h"
 #include "ssherr.h"
 #include "digest.h"
 #include "hmac.h"
@@ -406,6 +407,18 @@ lookup_key_in_hostkeys_by_type(struct hostkeys *hostkeys, int keytype,
             found) == HOST_FOUND);
 }
 
+int
+lookup_marker_in_hostkeys(struct hostkeys *hostkeys, int want_marker)
+{
+        u_int i;
+
+        for (i = 0; i < hostkeys->num_entries; i++) {
+                if (hostkeys->entries[i].marker == (HostkeyMarker)want_marker)
+                        return 1;
+        }
+        return 0;
+}
+
 static int
 write_host_entry(FILE *f, const char *host, const char *ip,
     const struct sshkey *key, int store_hash)
@@ -438,6 +451,44 @@ write_host_entry(FILE *f, const char *host, const char *ip,
 }
 
 /*
+ * Create user ~/.ssh directory if it doesn't exist and we want to write to it.
+ * If notify is set, a message will be emitted if the directory is created.
+ */
+void
+hostfile_create_user_ssh_dir(const char *filename, int notify)
+{
+        char *dotsshdir = NULL, *p;
+        size_t len;
+        struct stat st;
+
+        if ((p = strrchr(filename, '/')) == NULL)
+                return;
+        len = p - filename;
+        dotsshdir = tilde_expand_filename("~/" _PATH_SSH_USER_DIR, getuid());
+        if (strlen(dotsshdir) > len || strncmp(filename, dotsshdir, len) != 0)
+                goto out; /* not ~/.ssh prefixed */
+        if (stat(dotsshdir, &st) == 0)
+                goto out; /* dir already exists */
+        else if (errno != ENOENT)
+                error("Could not stat %s: %s", dotsshdir, strerror(errno));
+        else {
+#ifdef WITH_SELINUX
+                ssh_selinux_setfscreatecon(dotsshdir);
+#endif
+                if (mkdir(dotsshdir, 0700) == -1)
+                        error("Could not create directory '%.200s' (%s).",
+                            dotsshdir, strerror(errno));
+                else if (notify)
+                        logit("Created directory '%s'.", dotsshdir);
+#ifdef WITH_SELINUX
+                ssh_selinux_setfscreatecon(NULL);
+#endif
+        }
+ out:
+        free(dotsshdir);
+}
+
+/*
  * Appends an entry to the host file.  Returns false if the entry could not
  * be appended.
  */
@@ -450,6 +501,7 @@ add_host_to_hostfile(const char *filename, const char *host,
 
         if (key == NULL)
                 return 1;       /* XXX ? */
+        hostfile_create_user_ssh_dir(filename, 0);
         f = fopen(filename, "a");
         if (!f)
                 return 0;