2007.

[idzebra-moved-to-github.git] / util / passwddb.c

diff --git a/util/passwddb.c b/util/passwddb.c
index 27c56b8..a0f4ddc 100644 (file)
--- a/util/passwddb.c
+++ b/util/passwddb.c
@@ -1,5 +1,5 @@
-/* $Id: passwddb.c,v 1.13 2006-05-10 08:13:46 adam Exp $
-   Copyright (C) 1995-2005
+/* $Id: passwddb.c,v 1.16 2007-01-15 15:10:26 adam Exp $
+   Copyright (C) 1995-2007
    Index Data ApS
 
 This file is part of the Zebra server.
@@ -15,9 +15,9 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Zebra; see the file LICENSE.zebra.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
 */
 
 
@@ -135,15 +135,19 @@ int passwd_db_auth(Passwd_db db, const char *user, const char *pass)
     if (pe->encrypt_flag)
     {
 #if HAVE_CRYPT_H
-       char salt[3];
        const char *des_try;
        if (strlen (pe->des) < 3)
            return -3;
        if (!pass)
            return -2;
-       memcpy (salt, pe->des, 2);
-       salt[2] = '\0'; 
-       des_try = crypt (pass, salt);
+
+        if (pe->des[0] != '$') /* Not MD5? (assume DES) */
+        {
+            if (strlen(pass) > 8) /* maximum key length is 8 */
+                return -2;
+        }
+       des_try = crypt (pass, pe->des);
+
        if (strcmp (des_try, pe->des))
            return -2;
 #else