This commit was manufactured by cvs2svn to create tag 'FreeBSD-release/1.0'.

[unix-history] / libexec / ftpd / ftpd.c

diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c
index 6e8d270..2638e8d 100644 (file)
--- a/libexec/ftpd/ftpd.c
+++ b/libexec/ftpd/ftpd.c
@@ -448,11 +448,7 @@ pass(passwd)
                        salt = "xx";
                else
                        salt = pw->pw_passwd;
                        salt = "xx";
                else
                        salt = pw->pw_passwd;

-#ifdef DES

                xpasswd = crypt(passwd, salt);
                xpasswd = crypt(passwd, salt);

-#else
-               xpasswd = passwd;
-#endif

                /* The strcmp does not catch null passwords! */
                if (pw == NULL || *pw->pw_passwd == '\0' ||
                    strcmp(xpasswd, pw->pw_passwd)) {
                /* The strcmp does not catch null passwords! */
                if (pw == NULL || *pw->pw_passwd == '\0' ||
                    strcmp(xpasswd, pw->pw_passwd)) {