Attachment 579072 Details for Bug 814803 – patch hanlding crypt() returning NULL

[patch] patch hanlding crypt() returning NULL

yp-tools-2.12-cryptNULL.patch (text/plain), 1.96 KB, created by Paul Wouters on 2012-04-20 17:48:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Wouters

Created: 2012-04-20 17:48:13 UTC

Size: 1.96 KB

patch

obsolete

>diff -Naur yp-tools-2.12-orig/src/yppasswd.c yp-tools-2.12/src/yppasswd.c
>--- yp-tools-2.12-orig/src/yppasswd.c	2012-04-20 13:39:27.494732262 -0400
>+++ yp-tools-2.12/src/yppasswd.c	2012-04-20 13:39:40.963800828 -0400
>@@ -448,13 +448,18 @@
>     }
> 
>   passwdlen = get_passwd_len (pwd->pw_passwd);
>-  if (pwd->pw_passwd[0]
>-      && 0 != strcmp (pwd->pw_passwd, "x") /* don't check shadow passwords */
>-      && !strncmp (pwd->pw_passwd, crypt (pwdstr, pwd->pw_passwd), passwdlen)
>+  if (pwd->pw_passwd[0] 
>       && uid)
>     {
>-      fputs (_("You cannot reuse the old password.\n"), stderr);
>-      return 0;
>+      char *crypted = crypt(pwdstr, pwd->pw_passwd);
>+      if(crypted == NULL) {
>+        fputs (_("crypt() call failed.\n"), stderr);
>+        return 0;
>+      }
>+      if(!strncmp (pwd->pw_passwd, crypted, passwdlen)) {
>+        fputs (_("You cannot reuse the old password.\n"), stderr);
>+        return 0;
>+      }
>     }
> 
>   r = 0;
>@@ -737,9 +742,16 @@
> 	{
> 	  int passwdlen = get_passwd_len (pwd->pw_passwd);
> 	  char *sane_passwd = alloca (passwdlen + 1);
>+	  char *crypted;
> 	  strncpy (sane_passwd, pwd->pw_passwd, passwdlen);
> 	  sane_passwd[passwdlen] = 0;
>-	  if (strcmp (crypt (s, sane_passwd), sane_passwd))
>+	  crypted = crypt (s, sane_passwd);
>+	  if(crypted == NULL)
>+	    {
>+	      fprintf (stderr, _("Sorry - crypt() failed.\n"));
>+	      return 1;
>+	    }
>+	  if (strcmp (crypted, sane_passwd))
> 	    {
> 	      fprintf (stderr, _("Sorry.\n"));
> 	      return 1;
>@@ -754,6 +766,7 @@
>       char *error_msg;
> #endif /* USE_CRACKLIB */
>       char *buf, salt[37], *p = NULL;
>+      char *crypted;
>       int tries = 0;
> 
>       buf = (char *) malloc (129);
>@@ -834,7 +847,13 @@
> 	  break;
> 	}
> 
>-      yppwd.newpw.pw_passwd = strdup (crypt (buf, salt));
>+      crypted = crypt (buf, salt);
>+      if(crypted == NULL) {
>+	fprintf (stderr, _("Sorry - crypt() failed.\n"));
>+	return 1;
>+      } else {
>+	yppwd.newpw.pw_passwd = strdup (crypted);
>+      }
>     }
> 
>   if (f_flag)

Actions: View | Diff

Attachments on bug 814803: 579069 | 579072