diff options
author | Colin Watson <cjwatson@debian.org> | 2011-09-06 09:45:52 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2011-09-06 09:45:52 +0100 |
commit | f38224d546cdde55f45c13d3d8225d273a3f920e (patch) | |
tree | a91a26b88ac90dc72d0ea3767feabb341eaa50a8 /session.c | |
parent | 338146a3fc257e216fe5c10fe40e6896b40d7739 (diff) | |
parent | e90790abaf031e037f444a6658e136e48577ea49 (diff) |
merge 5.9p1
Diffstat (limited to 'session.c')
-rw-r--r-- | session.c | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -96,6 +96,10 @@ | |||
96 | #include <kafs.h> | 96 | #include <kafs.h> |
97 | #endif | 97 | #endif |
98 | 98 | ||
99 | #ifdef WITH_SELINUX | ||
100 | #include <selinux/selinux.h> | ||
101 | #endif | ||
102 | |||
99 | #define IS_INTERNAL_SFTP(c) \ | 103 | #define IS_INTERNAL_SFTP(c) \ |
100 | (!strncmp(c, INTERNAL_SFTP_NAME, sizeof(INTERNAL_SFTP_NAME) - 1) && \ | 104 | (!strncmp(c, INTERNAL_SFTP_NAME, sizeof(INTERNAL_SFTP_NAME) - 1) && \ |
101 | (c[sizeof(INTERNAL_SFTP_NAME) - 1] == '\0' || \ | 105 | (c[sizeof(INTERNAL_SFTP_NAME) - 1] == '\0' || \ |
@@ -1531,6 +1535,9 @@ do_pwchange(Session *s) | |||
1531 | if (s->ttyfd != -1) { | 1535 | if (s->ttyfd != -1) { |
1532 | fprintf(stderr, | 1536 | fprintf(stderr, |
1533 | "You must change your password now and login again!\n"); | 1537 | "You must change your password now and login again!\n"); |
1538 | #ifdef WITH_SELINUX | ||
1539 | setexeccon(NULL); | ||
1540 | #endif | ||
1534 | #ifdef PASSWD_NEEDS_USERNAME | 1541 | #ifdef PASSWD_NEEDS_USERNAME |
1535 | execl(_PATH_PASSWD_PROG, "passwd", s->pw->pw_name, | 1542 | execl(_PATH_PASSWD_PROG, "passwd", s->pw->pw_name, |
1536 | (char *)NULL); | 1543 | (char *)NULL); |