diff options
author | Colin Watson <cjwatson@debian.org> | 2011-02-05 10:53:12 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2011-02-05 10:53:12 +0000 |
commit | 338146a3fc257e216fe5c10fe40e6896b40d7739 (patch) | |
tree | 69f833402d23ff8b31b6573209400b226a3efe37 /ssh.c | |
parent | 6e62c9b671b7c6634fcdf25e468db11624203c65 (diff) | |
parent | afde81fe5d3d6d3e9721ec56981e0214ea850bc6 (diff) |
merge 5.8p1
Diffstat (limited to 'ssh.c')
-rw-r--r-- | ssh.c | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -852,15 +852,12 @@ main(int ac, char **av) | |||
852 | strcmp(pw->pw_dir, "/") ? "/" : "", _PATH_SSH_USER_DIR); | 852 | strcmp(pw->pw_dir, "/") ? "/" : "", _PATH_SSH_USER_DIR); |
853 | if (r > 0 && (size_t)r < sizeof(buf) && stat(buf, &st) < 0) { | 853 | if (r > 0 && (size_t)r < sizeof(buf) && stat(buf, &st) < 0) { |
854 | #ifdef WITH_SELINUX | 854 | #ifdef WITH_SELINUX |
855 | char *scon; | 855 | ssh_selinux_setfscreatecon(buf); |
856 | |||
857 | matchpathcon(buf, 0700, &scon); | ||
858 | setfscreatecon(scon); | ||
859 | #endif | 856 | #endif |
860 | if (mkdir(buf, 0700) < 0) | 857 | if (mkdir(buf, 0700) < 0) |
861 | error("Could not create directory '%.200s'.", buf); | 858 | error("Could not create directory '%.200s'.", buf); |
862 | #ifdef WITH_SELINUX | 859 | #ifdef WITH_SELINUX |
863 | setfscreatecon(NULL); | 860 | ssh_selinux_setfscreatecon(NULL); |
864 | #endif | 861 | #endif |
865 | } | 862 | } |
866 | /* load options.identity_files */ | 863 | /* load options.identity_files */ |