-/* $Id: passwddb.c,v 1.13 2006-05-10 08:13:46 adam Exp $
- Copyright (C) 1995-2005
+/* $Id: passwddb.c,v 1.15 2006-10-11 20:18:47 adam Exp $
+ Copyright (C) 1995-2006
Index Data ApS
This file is part of the Zebra server.
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
+
*/
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