File useradd-mkdirs.diff of Package shadow.3210

Overview Repositories Revisions Requests Users Attributes Meta

File useradd-mkdirs.diff of Package shadow.3210

diff --git a/src/useradd.c b/src/useradd.c
index fa93853..a9f8caa 100644
--- a/src/useradd.c
+++ b/src/useradd.c
@@ -1757,6 +1757,13 @@ static void usr_update (void)
 static void create_home (void)
 {
 	if (access (user_home, F_OK) != 0) {
+		char path[strlen (user_home) + 2];
+		char *bhome, *cp;
+
+		path[0] = '\0';
+		bhome = strdup (user_home);
+		++bhome;
+
 #ifdef WITH_SELINUX
 		if (set_selinux_file_context (user_home) != 0) {
 		        fprintf (stderr,
@@ -1765,19 +1772,42 @@ static void create_home (void)
 			fail_exit (E_HOMEDIR);
 		}
 #endif
-		/* XXX - create missing parent directories.  --marekm */
-		if (mkdir (user_home, 0) != 0) {
-			fprintf (stderr,
-			         _("%s: cannot create directory %s\n"),
-			         Prog, user_home);
+
+		/* Check for every part of the path, if the directory
+		   exists. If not, create it with permissions 755 and
+		   owner root:root.
+		 */
+		cp = strtok (bhome, "/");
+		while (cp) {
+			strcat (path, "/");
+			strcat (path, cp);
+			if (access (path, F_OK) != 0) {
+				if (mkdir (path, 0) != 0) {
+					fprintf (stderr,
+					         _("%s: cannot create directory %s\n"),
+					         Prog, path);
 #ifdef WITH_AUDIT
-			audit_logger (AUDIT_ADD_USER, Prog,
-			              "adding home directory",
-			              user_name, (unsigned int) user_id,
-			              SHADOW_AUDIT_FAILURE);
+					audit_logger (AUDIT_ADD_USER, Prog,
+								  "adding home directory",
+								  user_name, (unsigned int) user_id,
+								  SHADOW_AUDIT_FAILURE);
 #endif
-			fail_exit (E_HOMEDIR);
+					fail_exit (E_HOMEDIR);
+				}
+				if (chown (path, 0, 0) < 0) {
+					fprintf (stderr,
+					         _("%s: warning: chown on `%s' failed: %m\n"),
+					         Prog, path);
+				}
+				if (chmod (path, 0777) < 0) {
+					fprintf (stderr,
+					         _("%s: warning: chmod on `%s' failed: %m\n"),
+					         Prog, path);
+				}
+			}
+			cp = strtok (NULL, "/");
 		}
+
 		chown (user_home, user_id, user_gid);
 		chmod (user_home,
 		       0777 & ~getdef_num ("UMASK", GETDEF_DEFAULT_UMASK));

Places

File useradd-mkdirs.diff of Package shadow.3210

Places