merge with 1.9

diff --git a/login-utils/su.c b/login-utils/su.c
index 7669aef1aebc2197d900587207843877c39b65ff..6ea70e51c89f7601f23b073575942e2fe81bac2b 100644 (file)
--- a/login-utils/su.c
+++ b/login-utils/su.c
@@ -331,6 +331,11 @@ correct_password (pw)
     return 1;
 
   unencrypted = getpass ("Password:");
+  if (unencrypted == NULL)
+    {
+      error (0, 0, "getpass: cannot open /dev/tty");
+      return 0;
+    }
   encrypted = crypt (unencrypted, correct);
   bzero (unencrypted, strlen (unencrypted));
   return strcmp (encrypted, correct) == 0;