2007-11-29 15:10:29 +00:00
--- shadow-4.0.18.1/libmisc/Makefile.am.useradd 2005-09-05 18:21:37.000000000 +0200
+++ shadow-4.0.18.1/libmisc/Makefile.am 2007-11-29 15:47:39.000000000 +0100
@@ -41,6 +41,7 @@ libmisc_a_SOURCES = \
setugid.c \
setupenv.c \
shell.c \
+ system.c \
strtoday.c \
sub.c \
sulog.c \
--- shadow-4.0.18.1/libmisc/system.c.useradd 2007-11-29 15:47:39.000000000 +0100
+++ shadow-4.0.18.1/libmisc/system.c 2007-11-29 15:47:39.000000000 +0100
2007-02-28 16:24:03 +00:00
@@ -0,0 +1,37 @@
+#include <config.h>
+
+#ident "$Id: shell.c,v 1.13 2006/01/18 19:38:27 kloczek Exp $"
+
+#include <stdio.h>
+#include <sys/wait.h>
+#include <fcntl.h>
+#include "prototypes.h"
+#include "defines.h"
+
+int safe_system(const char *command, const char *argv[], const char *env[], int ignore_stderr)
+{
+ int status = -1;
+ int fd;
+ pid_t pid;
+
+ pid = fork();
+ if (pid < 0)
+ return -1;
+
+ if (pid) { /* Parent */
+ waitpid(pid, &status, 0);
+ return status;
+ }
+
+ fd = open("/dev/null", O_RDWR);
+ /* Child */
+ dup2(fd,0); // Close Stdin
+ if (ignore_stderr)
+ dup2(fd,2); // Close Stderr
+
+ execve(command, (char *const *) argv, (char *const *) env);
+ fprintf (stderr,
+ _("Failed to exec '%s'\n"), argv[0]);
+ exit (-1);
+}
+
2007-11-29 15:10:29 +00:00
--- shadow-4.0.18.1/libmisc/copydir.c.useradd 2006-07-10 06:35:56.000000000 +0200
+++ shadow-4.0.18.1/libmisc/copydir.c 2007-11-29 15:47:39.000000000 +0100
@@ -54,7 +54,7 @@ struct link_name {
2007-02-28 16:24:03 +00:00
static struct link_name *links;
#ifdef WITH_SELINUX
-static int selinux_file_context (const char *dst_name)
+int selinux_file_context (const char *dst_name)
{
security_context_t scontext = NULL;
2007-11-29 15:10:29 +00:00
--- shadow-4.0.18.1/man/usermod.8.xml.useradd 2006-07-24 07:48:36.000000000 +0200
+++ shadow-4.0.18.1/man/usermod.8.xml 2007-11-29 15:47:39.000000000 +0100
2007-02-28 16:24:03 +00:00
@@ -226,6 +226,19 @@
</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term>
+ <option>-Z</option>, <option>--selinux-user</option>
+ <replaceable>SEUSER</replaceable>
+ </term>
+ <listitem>
+ <para>
+ The SELinux user for the user's login. The default is to leave this
+ field the blank, which causes the system to select the default
+ SELinux user.
+ </para>
+ </listitem>
+ </varlistentry>
</variablelist>
</refsect1>
2007-11-29 15:10:29 +00:00
--- shadow-4.0.18.1/man/usermod.8.useradd 2006-07-30 22:54:28.000000000 +0200
+++ shadow-4.0.18.1/man/usermod.8 2007-11-29 15:47:39.000000000 +0100
@@ -92,6 +92,10 @@ Unlock a user's password. This removes t
\fB\-p\fR
or
\fB\-L\fR.
+.TP 3n
+\fB\-Z\fR, \fB\-\-selinux-user\fR \fISEUSER\fR
+The SELinux user for the user's login. The default is to leave this field blank, which causes the system to select the default SELinux user.
+
.SH "CAVEATS"
.PP
--- shadow-4.0.18.1/man/useradd.8.useradd 2007-11-29 15:46:24.000000000 +0100
+++ shadow-4.0.18.1/man/useradd.8 2007-11-29 15:47:39.000000000 +0100
@@ -137,6 +137,9 @@ The name of the user's login shell. The
The numerical value of the user's ID. This value must be unique, unless the
\fB\-o\fR
option is used. The value must be non\-negative. The default is to use the smallest ID value greater than 999 and greater than every other user. Values between 0 and 999 are typically reserved for system accounts.
+.TP 3n
+\fB\-Z\fR, \fB\-\-selinux-user\fR \fISEUSER\fR
+The SELinux user for the user's login. The default is to leave this field blank, which causes the system to select the default SELinux user.
.SS "Changing the default values"
.PP
When invoked with the
--- shadow-4.0.18.1/man/useradd.8.xml.useradd 2006-07-24 07:48:36.000000000 +0200
+++ shadow-4.0.18.1/man/useradd.8.xml 2007-11-29 15:47:39.000000000 +0100
2007-02-28 16:24:03 +00:00
@@ -251,6 +251,19 @@
</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term>
+ <option>-Z</option>, <option>--selinux-user</option>
+ <replaceable>SEUSER</replaceable>
+ </term>
+ <listitem>
+ <para>
+ The SELinux user for the user's login. The default is to leave this
+ field blank, which causes the system to select the default SELinux
+ user.
+ </para>
+ </listitem>
+ </varlistentry>
</variablelist>
<refsect2 id='changing_the_default_values'>
2007-11-29 15:10:29 +00:00
--- shadow-4.0.18.1/src/userdel.c.useradd 2007-11-29 15:46:24.000000000 +0100
+++ shadow-4.0.18.1/src/userdel.c 2007-11-29 15:47:39.000000000 +0100
@@ -792,6 +792,17 @@ int main (int argc, char **argv)
#endif
}
2007-02-28 16:24:03 +00:00
+#ifdef WITH_SELINUX
2007-11-29 15:10:29 +00:00
+ if (is_selinux_enabled() > 0) {
+ const char *argv[5];
+ argv[0] = "/usr/sbin/semanage";
+ argv[1] = "login";
+ argv[2] = "-d";
+ argv[3] = user_name;
+ argv[4] = NULL;
+ safe_system(argv[0], argv, NULL, 1);
+ }
+#endif
/*
* Cancel any crontabs or at jobs. Have to do this before we remove
* the entry from /etc/passwd.
--- shadow-4.0.18.1/src/usermod.c.useradd 2007-11-29 15:46:24.000000000 +0100
+++ shadow-4.0.18.1/src/usermod.c 2007-11-29 15:47:39.000000000 +0100
@@ -90,6 +90,7 @@ static char *user_comment;
static char *user_home;
static char *user_newhome;
static char *user_shell;
+static const char *user_selinux = "";
static long user_expire;
static long user_inactive;
static long sys_ngroups;
@@ -132,6 +133,7 @@ static int is_shadow_grp;
static int get_groups (char *);
static void usage (void);
static void new_pwent (struct passwd *);
+static void selinux_update_mapping (void);
static void new_spent (struct spwd *);
static void fail_exit (int);
@@ -294,6 +296,9 @@ static void usage (void)
" -s, --shell SHELL new login shell for the user account\n"
" -u, --uid UID new UID for the user account\n"
" -U, --unlock unlock the user account\n"
+#ifdef WITH_SELINUX
+ " -Z, --selinux-user new selinux user mapping for the user account\n"
2007-02-28 16:24:03 +00:00
+#endif
2007-11-29 15:10:29 +00:00
"\n"));
exit (E_USAGE);
}
@@ -918,13 +923,20 @@ static void process_flags (int argc, cha
{"move-home", no_argument, NULL, 'm'},
{"non-unique", no_argument, NULL, 'o'},
{"password", required_argument, NULL, 'p'},
+#ifdef WITH_SELINUX
+ {"selinux-user", required_argument, NULL, 'Z'},
+#endif
{"shell", required_argument, NULL, 's'},
{"uid", required_argument, NULL, 'u'},
{"unlock", no_argument, NULL, 'U'},
{NULL, 0, NULL, '\0'}
};
while ((c =
+#ifdef WITH_SELINUX
+ getopt_long (argc, argv, "ac:d:e:f:g:G:hl:Lmop:s:u:UZ:",
+#else
getopt_long (argc, argv, "ac:d:e:f:g:G:hl:Lmop:s:u:U",
+#endif
long_options, NULL)) != -1) {
switch (c) {
case 'a':
@@ -1073,6 +1085,16 @@ static void process_flags (int argc, cha
2007-02-28 16:24:03 +00:00
2007-11-29 15:10:29 +00:00
Uflg++;
break;
+#ifdef WITH_SELINUX
+ case 'Z':
+ if (is_selinux_enabled() > 0)
+ user_selinux = optarg;
+ else {
+ fprintf (stderr, _("%s: -Z requires SELinux enabled kernel\n"), Prog);
+ exit (E_BAD_ARG);
+ }
+ break;
+#endif
default:
usage ();
}
@@ -1542,6 +1564,8 @@ int main (int argc, char **argv)
if (Gflg || lflg)
grp_err = grp_update ();
2007-02-28 16:24:03 +00:00
2007-11-29 15:10:29 +00:00
+ selinux_update_mapping();
2007-02-28 16:24:03 +00:00
+
2007-11-29 15:10:29 +00:00
if (mflg)
move_home ();
2007-02-28 16:24:03 +00:00
2007-11-29 15:10:29 +00:00
@@ -1573,3 +1597,62 @@ int main (int argc, char **argv)
exit (E_SUCCESS);
/* NOT REACHED */
}
+
+static void selinux_update_mapping () {
2007-02-28 16:24:03 +00:00
+#ifdef WITH_SELINUX
2007-11-29 15:10:29 +00:00
+ const char *argv[7];
+
+ if (is_selinux_enabled() <= 0) return;
+
+ if (*user_selinux) {
+ argv[0] = "/usr/sbin/semanage";
+ argv[1] = "login";
+ argv[2] = "-m";
+ argv[3] = "-s";
+ argv[4] = user_selinux;
+ argv[5] = user_name;
+ argv[6] = NULL;
+ if (safe_system(argv[0], argv, NULL, 1)) {
+ argv[2] = "-a";
+ if (safe_system(argv[0], argv, NULL, 0)) {
+ fprintf (stderr,
+ _("%s: warning: the user name %s to %s SELinux user mapping failed.\n"),
+ Prog, user_name, user_selinux);
+#ifdef WITH_AUDIT
+ audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
+ "modifying User mapping ", user_name, user_id, 0);
+#endif
+ }
+ }
+ }
+
+ if (dflg || *user_selinux) {
+ argv[0] = "/usr/sbin/genhomedircon";
+ argv[1] = NULL;
+ if(safe_system(argv[0], argv, NULL,0)) {
+ fprintf (stderr,
+ _("%s: warning: unable to relabel the homedir %s for %s.\n"),
+ Prog, user_home, user_name);
+#ifdef WITH_AUDIT
+ audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
+ "relabeling home directory", user_name, user_id, 0);
2007-02-28 16:24:03 +00:00
+#endif
2007-11-29 15:10:29 +00:00
+ }
+
+ argv[0] = "/sbin/restorecon";
+ argv[1] = "-F";
+ argv[2] = "-R";
+ argv[3] = user_home;
+ argv[4] = NULL;
+ if (safe_system(argv[0], argv, NULL, 0)) {
+ fprintf (stderr,
+ _("%s: warning: unable to relabel the homedir %s for %s.\n"),
+ Prog, user_home, user_name);
+#ifdef WITH_AUDIT
+ audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
+ "relabeling home directory", user_name, user_id, 0);
+#endif
+ }
+ }
+#endif
+}
--- shadow-4.0.18.1/src/useradd.c.useradd 2007-11-29 15:46:24.000000000 +0100
+++ shadow-4.0.18.1/src/useradd.c 2007-11-29 15:52:00.000000000 +0100
@@ -100,6 +100,7 @@ static const char *user_comment = "";
2006-12-21 20:09:26 +00:00
static const char *user_home = "";
static const char *user_shell = "";
static const char *create_mail_spool = "";
+static const char *user_selinux = "";
static long user_expire = -1;
static int is_shadow_pwd;
2007-11-29 15:10:29 +00:00
@@ -170,6 +171,7 @@ static int set_defaults (void);
2006-12-21 20:09:26 +00:00
static int get_groups (char *);
static void usage (void);
static void new_pwent (struct passwd *);
+static void selinux_update_mapping (void);
static long scale_age (long);
static void new_spent (struct spwd *);
2007-11-29 15:10:29 +00:00
@@ -354,6 +356,7 @@ static void get_defaults (void)
2006-12-21 20:09:26 +00:00
def_create_mail_spool = xstrdup (cp);
}
}
+ fclose(fp);
}
/*
2007-11-29 15:10:29 +00:00
@@ -641,7 +644,10 @@ static void usage (void)
2006-12-21 20:09:26 +00:00
" -p, --password PASSWORD use encrypted password for the new user\n"
" account\n"
" -s, --shell SHELL the login shell for the new user account\n"
- " -u, --uid UID force use the UID for the new user account\n"
+ " -u, --uid UID force use the UID for the new user account\n"
2006-11-30 21:52:48 +00:00
+#ifdef WITH_SELINUX
2006-12-21 20:09:26 +00:00
+ " -Z, --selinux-user SEUSER use a specific SEUSER for the SELinux user mapping\n"
+#endif
"\n"));
exit (E_USAGE);
}
2007-11-29 15:10:29 +00:00
@@ -1041,11 +1047,18 @@ static void process_flags (int argc, cha
2006-12-21 20:09:26 +00:00
{"non-unique", no_argument, NULL, 'o'},
{"password", required_argument, NULL, 'p'},
{"shell", required_argument, NULL, 's'},
+#ifdef WITH_SELINUX
+ {"selinux-user", required_argument, NULL, 'Z'},
+#endif
{"uid", required_argument, NULL, 'u'},
{NULL, 0, NULL, '\0'}
};
while ((c =
+#ifdef WITH_SELINUX
+ getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mlMnrop:s:u:Z:",
+#else
2007-11-29 15:10:29 +00:00
getopt_long (argc, argv, "b:c:d:De:f:g:G:k:K:mlMnrop:s:u:",
2006-12-21 20:09:26 +00:00
+#endif
long_options, NULL)) != -1) {
switch (c) {
case 'b':
2007-11-29 15:10:29 +00:00
@@ -1229,6 +1242,17 @@ static void process_flags (int argc, cha
2006-12-21 20:09:26 +00:00
case 'M':
Mflg++;
break;
+#ifdef WITH_SELINUX
+ case 'Z':
+ if (is_selinux_enabled() > 0)
+ user_selinux = optarg;
+ else {
+ fprintf (stderr,_("%s: -Z requires SELinux enabled kernel\n"), Prog);
+
+ exit (E_BAD_ARG);
+ }
+ break;
+#endif
default:
usage ();
}
2007-11-29 15:10:29 +00:00
@@ -1596,6 +1620,33 @@ static void usr_update (void)
2006-12-21 20:09:26 +00:00
grp_update ();
}
+static void selinux_update_mapping () {
+
+#ifdef WITH_SELINUX
+ if (is_selinux_enabled() <= 0) return;
+
+ if (*user_selinux) { /* must be done after passwd write() */
+ const char *argv[7];
+ argv[0] = "/usr/sbin/semanage";
+ argv[1] = "login";
+ argv[2] = "-a";
+ argv[3] = "-s";
+ argv[4] = user_selinux;
+ argv[5] = user_name;
+ argv[6] = NULL;
+ if (safe_system(argv[0], argv, NULL, 0)) {
+ fprintf (stderr,
+ _("%s: warning: the user name %s to %s SELinux user mapping failed.\n"),
+ Prog, user_name, user_selinux);
+#ifdef WITH_AUDIT
+ audit_logger (AUDIT_USER_CHAUTHTOK, Prog,
+ "adding SELinux user mapping", user_name, user_id, 0);
+#endif
+ }
+ }
2006-11-30 21:52:48 +00:00
+#endif
2006-12-21 20:09:26 +00:00
+
+}
/*
* create_home - create the user's home directory
*
2007-11-29 15:10:29 +00:00
@@ -1605,7 +1656,11 @@ static void usr_update (void)
2006-11-30 21:52:48 +00:00
*/
static void create_home (void)
{
+
if (access (user_home, F_OK)) {
2006-12-21 20:09:26 +00:00
+#ifdef WITH_SELINUX
+ selinux_file_context (user_home);
+#endif
2006-11-30 21:52:48 +00:00
/* XXX - create missing parent directories. --marekm */
if (mkdir (user_home, 0)) {
2006-12-21 20:09:26 +00:00
fprintf (stderr,
2007-11-29 15:10:29 +00:00
@@ -1833,6 +1888,17 @@ int main (int argc, char **argv)
2006-12-21 20:09:26 +00:00
usr_update ();
2007-11-29 15:10:29 +00:00
+ /* Do not create mail directory for system accounts */
+ if( !rflg )
+ create_mail ();
2006-12-21 20:09:26 +00:00
+
+ nscd_flush_cache ("passwd");
+ nscd_flush_cache ("group");
+
+ close_files ();
+
+ selinux_update_mapping();
+
if (mflg) {
create_home ();
if (home_added)
2007-11-29 15:10:29 +00:00
@@ -1856,15 +1922,6 @@ int main (int argc, char **argv)
2006-12-21 20:09:26 +00:00
* with --gafton
*/
2007-11-29 15:10:29 +00:00
- /* Do not create mail directory for system accounts */
- if( !rflg )
- create_mail ();
2006-12-21 20:09:26 +00:00
-
- nscd_flush_cache ("passwd");
- nscd_flush_cache ("group");
-
- close_files ();
-
#ifdef USE_PAM
if (retval == PAM_SUCCESS)
pam_end (pamh, PAM_SUCCESS);
2007-11-29 15:10:29 +00:00
--- shadow-4.0.18.1/lib/defines.h.useradd 2005-09-05 18:22:03.000000000 +0200
+++ shadow-4.0.18.1/lib/defines.h 2007-11-29 15:47:39.000000000 +0100
@@ -342,4 +342,7 @@ extern char *strerror ();
#include <libaudit.h>
2006-11-30 21:52:48 +00:00
#endif
2006-12-21 20:09:26 +00:00
+#ifdef WITH_SELINUX
2007-11-29 15:10:29 +00:00
+#include <selinux/selinux.h>
2006-12-21 20:09:26 +00:00
+#endif
2007-11-29 15:10:29 +00:00
#endif /* _DEFINES_H_ */
--- shadow-4.0.18.1/lib/prototypes.h.useradd 2006-02-07 17:36:30.000000000 +0100
+++ shadow-4.0.18.1/lib/prototypes.h 2007-11-29 15:47:39.000000000 +0100
@@ -52,6 +52,9 @@ extern int is_listed (const char *, cons
/* copydir.c */
extern int copy_tree (const char *, const char *, uid_t, gid_t);
extern int remove_tree (const char *);
2006-11-30 21:52:48 +00:00
+#ifdef WITH_SELINUX
2007-11-29 15:10:29 +00:00
+extern int selinux_file_context (const char *dst_name);
2006-12-21 20:09:26 +00:00
+#endif
2007-11-29 15:10:29 +00:00
/* encrypt.c */
extern char *pw_encrypt (const char *, const char *);
@@ -147,6 +150,9 @@ extern void setup_env (struct passwd *);
/* shell.c */
extern int shell (const char *, const char *, char *const *);
2006-12-21 20:09:26 +00:00
2007-11-29 15:10:29 +00:00
+/* system.c */
+extern int safe_system(const char *command, const char *argv[], const char *env[], int ignore_stderr);
2006-12-21 20:09:26 +00:00
+
2007-11-29 15:10:29 +00:00
/* strtoday.c */
extern long strtoday (const char *);
2006-12-21 20:09:26 +00:00
