|
 |
b95810 |
diff -up shadow-4.6/libmisc/prefix_flag.c.usermod-crash shadow-4.6/libmisc/prefix_flag.c
|
|
|
b95810 |
--- shadow-4.6/libmisc/prefix_flag.c.usermod-crash 2018-04-29 18:42:37.000000000 +0200
|
|
|
b95810 |
+++ shadow-4.6/libmisc/prefix_flag.c 2018-05-28 15:14:10.642302440 +0200
|
|
|
b95810 |
@@ -319,6 +319,7 @@ extern struct group *prefix_getgr_nam_gi
|
|
|
b95810 |
{
|
|
|
b95810 |
long long int gid;
|
|
|
b95810 |
char *endptr;
|
|
|
b95810 |
+ struct group *g;
|
|
|
b95810 |
|
|
|
b95810 |
if (NULL == grname) {
|
|
|
b95810 |
return NULL;
|
|
|
b95810 |
@@ -333,7 +334,8 @@ extern struct group *prefix_getgr_nam_gi
|
|
|
b95810 |
&& (gid == (gid_t)gid)) {
|
|
|
b95810 |
return prefix_getgrgid ((gid_t) gid);
|
|
|
b95810 |
}
|
|
|
b95810 |
- return prefix_getgrnam (grname);
|
|
|
b95810 |
+ g = prefix_getgrnam (grname);
|
|
|
b95810 |
+ return g ? __gr_dup(g) : NULL;
|
|
|
b95810 |
}
|
|
|
b95810 |
else
|
|
|
b95810 |
return getgr_nam_gid(grname);
|
|
|
b95810 |
diff -up shadow-4.6/src/usermod.c.usermod-crash shadow-4.6/src/usermod.c
|
|
|
b95810 |
--- shadow-4.6/src/usermod.c.usermod-crash 2018-05-28 15:12:37.920332763 +0200
|
|
|
b95810 |
+++ shadow-4.6/src/usermod.c 2018-05-28 15:15:50.337422470 +0200
|
|
|
b95810 |
@@ -1276,11 +1276,13 @@ static void process_flags (int argc, cha
|
|
|
b95810 |
prefix_user_home = xmalloc(len);
|
|
|
b95810 |
wlen = snprintf(prefix_user_home, len, "%s/%s", prefix, user_home);
|
|
|
b95810 |
assert (wlen == (int) len -1);
|
|
|
b95810 |
+ if (user_newhome) {
|
|
|
b95810 |
+ len = strlen(prefix) + strlen(user_newhome) + 2;
|
|
|
b95810 |
+ prefix_user_newhome = xmalloc(len);
|
|
|
b95810 |
+ wlen = snprintf(prefix_user_newhome, len, "%s/%s", prefix, user_newhome);
|
|
|
b95810 |
+ assert (wlen == (int) len -1);
|
|
|
b95810 |
+ }
|
|
|
b95810 |
|
|
|
b95810 |
- len = strlen(prefix) + strlen(user_newhome) + 2;
|
|
|
b95810 |
- prefix_user_newhome = xmalloc(len);
|
|
|
b95810 |
- wlen = snprintf(prefix_user_newhome, len, "%s/%s", prefix, user_newhome);
|
|
|
b95810 |
- assert (wlen == (int) len -1);
|
|
|
b95810 |
}
|
|
|
b95810 |
else {
|
|
|
b95810 |
prefix_user_home = user_home;
|