emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Set the method string as a constant string.

Browse Source
This commit is contained in:
nekral-guest 2008-01-06 13:49:00 +00:00
parent 06691758e8
commit e5b7987764
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2008-01-06 Nicolas François <nicolas.francois@centraliens.net>
* lib/encrypt.c: Set the method string as a constant string.
2008-01-06 Nicolas François <nicolas.francois@centraliens.net> 2008-01-06 Nicolas François <nicolas.francois@centraliens.net>
* lib/port.c: Assume <errno.h> declares errno. * lib/port.c: Assume <errno.h> declares errno.

8
lib/encrypt.c
View File

@ -54,7 +54,7 @@ char *pw_encrypt (const char *clear, const char *salt)
* supported, and return a DES encrypted password. */ * supported, and return a DES encrypted password. */
if (salt && salt[0] == '$' && strlen (cp) <= 13) if (salt && salt[0] == '$' && strlen (cp) <= 13)
{ {
char *method = "$1$"; const char *method;
switch (salt[1]) switch (salt[1])
{ {
case '1': case '1':
@ -67,7 +67,11 @@ char *pw_encrypt (const char *clear, const char *salt)
method = "SHA512"; method = "SHA512";
break; break;
default: default:
method[1] = salt[1]; {
static char nummethod[4] = "$x$";
nummethod[1] = salt[1];
method = &nummethod[0];
}
} }
fprintf (stderr, fprintf (stderr,
_("crypt method not supported by libcrypt? (%s)\n"), _("crypt method not supported by libcrypt? (%s)\n"),