Index: src/ftpd.c
*** src/ftpd.c	Mon Sep 13 11:53:08 1999
--- src/ftpd.c	Mon Sep 13 11:50:07 1999
***************
*** 2383,2398 ****
  #ifndef OPIE
  	  salt = pw->pw_passwd;
  #ifdef SECUREOSF
! 	if ((pr = getprpwnam(pw->pw_name)) != NULL) {
! 	    if (pr->uflg.fg_newcrypt)
! 		crypt_alg = pr->ufld.fd_newcrypt;
! 	    else if (pr->sflg.fg_newcrypt)
! 		crypt_alg = pr->sfld.fd_newcrypt;
! 	    else
! 		crypt_alg = 0;
! 	} else {
! 	    crypt_alg = 0;
! 	}
  
  	xpasswd = dispcrypt(passwd, salt, crypt_alg);
  #else
--- 2383,2394 ----
  #ifndef OPIE
  	  salt = pw->pw_passwd;
  #ifdef SECUREOSF
! 	if ((pr = getprpwnam(pw->pw_name)) != NULL &&
! 	     pr->uflg.fg_oldcrypt && pr->ufld.fd_oldcrypt > 0 &&
! 	     pr->ufld.fd_oldcrypt < AUTH_CRYPT__MAX)
! 		crypt_alg = pr->ufld.fd_oldcrypt;
! 	else
! 		crypt_alg = AUTH_CRYPT_OLDCRYPT;     /* reasonable default? */
  
  	xpasswd = dispcrypt(passwd, salt, crypt_alg);
  #else
UTH_CRYPT__MAX)
! 		crypt_alg = pr->ufld.fd_oldcrypt;
! 	else
! 		crypt_alg = AUTH_CRYPT_OLDCRYPT;     /* reasonable default? */
  
  	xpasswd = dispcrypt(passwd, salt, crypt_alg);
  #else