From: nekral-guest <nekral-guest@5a98b0ae-9ef6-0310-add3-de5d479b70d7>
Date: Thu, 22 Nov 2007 09:27:51 +0000 (+0000)
Subject: Remove chunk that should not have been committed.
X-Git-Tag: 4.1.0~45
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=905596ced54d211db6b06863fec045c26e72b908;p=shadow

Remove chunk that should not have been committed.
---

diff --git a/lib/encrypt.c b/lib/encrypt.c
index 539ba034..44f04362 100644
--- a/lib/encrypt.c
+++ b/lib/encrypt.c
@@ -49,29 +49,6 @@ char *pw_encrypt (const char *clear, const char *salt)
 		perror ("crypt");
 		exit (1);
 	}
-	if (salt && salt[0] == '$' && strlen (cp) <= 13)
-	{
-		/* The crypt algorithm was not recognized by libcrypt */
-		char *method = "$1$";
-		switch (salt[1])
-		{
-			case '1':
-				method = "MD5";
-				break;
-			case '5':
-				method = "SHA256";
-				break;
-			case '6':
-				method = "SHA512";
-				break;
-			default:
-				method[1] = salt[1];
-		}
-		fprintf (stderr,
-			 _("Unknown crypt method (%s)\n"),
-			  method);
-		exit (1);
-	}
 	if (strlen (cp) != 13)
 		return cp;	/* nonstandard crypt() in libc, better bail out */
 	strcpy (cipher, cp);