Attachment 158963 Details for Bug 247514 – backport of a patch from 4.0.18.1

[patch] backport of a patch from 4.0.18.1

overflow.patch (text/plain), 1.17 KB, created by Tomas Heinrich on 2007-07-11 15:37:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomas Heinrich

Created: 2007-07-11 15:37:27 UTC

Size: 1.17 KB

patch

obsolete

>--- shadow-4.0.17/src/chpasswd.c.orig	2007-07-11 15:38:40.000000000 +0200
>+++ shadow-4.0.17/src/chpasswd.c	2007-07-11 17:23:44.000000000 +0200
>@@ -239,9 +239,13 @@ int main (int argc, char **argv)
> 		newpwd = cp;
> 		if (!eflg) {
> 			if (md5flg) {
>-				char salt[12] = "$1$";
>+			        char tmp[12];
>+				char salt[15] = "\0";
> 
>-				strcat (salt, crypt_make_salt ());
>+				strcpy(tmp, crypt_make_salt());
>+				if (strncmp(tmp, "$1$", 3))
>+				        strcat(salt, "$1$");
>+			        strcat(salt, tmp);
> 				cp = pw_encrypt (newpwd, salt);
> 			} else
> 				cp = pw_encrypt (newpwd, crypt_make_salt ());
>--- shadow-4.0.17/src/chgpasswd.c.orig	2007-07-11 15:44:12.000000000 +0200
>+++ shadow-4.0.17/src/chgpasswd.c	2007-07-11 17:16:28.000000000 +0200
>@@ -243,9 +243,13 @@ int main (int argc, char **argv)
> 		newpwd = cp;
> 		if (!eflg) {
> 			if (md5flg) {
>-				char salt[12] = "$1$";
>+			        char tmp[12];
>+				char salt[15] = "\0";
> 
>-				strcat (salt, crypt_make_salt ());
>+				strcpy(tmp, crypt_make_salt());
>+				if (strncmp(tmp, "$1$", 3))
>+				        strcat(salt, "$1$");
>+				strcat(salt, tmp);
> 				cp = pw_encrypt (newpwd, salt);
> 			} else
> 				cp = pw_encrypt (newpwd, crypt_make_salt ());

Actions: View | Diff

Attachments on bug 247514: 158963