===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/encrypt/encrypt.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -c -r1.20 -r1.21
*** src/usr.bin/encrypt/encrypt.c	2003/11/23 19:00:27	1.20
--- src/usr.bin/encrypt/encrypt.c	2004/07/13 21:09:48	1.21
***************
*** 1,4 ****
! /*	$OpenBSD: encrypt.c,v 1.20 2003/11/23 19:00:27 otto Exp $	*/
  
  /*
   * Copyright (c) 1996, Jason Downs.  All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: encrypt.c,v 1.21 2004/07/13 21:09:48 millert Exp $	*/
  
  /*
   * Copyright (c) 1996, Jason Downs.  All rights reserved.
***************
*** 84,92 ****
  print_passwd(char *string, int operation, void *extra)
  {
  	char msalt[3], *salt;
- 	struct passwd pwd;
  	login_cap_t *lc;
! 	int pwd_gensalt(char *, int, struct passwd *, login_cap_t *, char);
  	void to64(char *, int32_t, int n);
  
  	switch(operation) {
--- 84,91 ----
  print_passwd(char *string, int operation, void *extra)
  {
  	char msalt[3], *salt;
  	login_cap_t *lc;
! 	int pwd_gensalt(char *, int, login_cap_t *, char);
  	void to64(char *, int32_t, int n);
  
  	switch(operation) {
***************
*** 120,130 ****
  		break;
  
  	default:
- 		pwd.pw_name = "default";
  		if ((lc = login_getclass(extra)) == NULL)
  			errx(1, "unable to get login class `%s'",
  			    extra ? (char *)extra : "default");
! 		if (!pwd_gensalt(buffer, _PASSWORD_LEN, &pwd, lc, 'l'))
  			errx(1, "can't generate salt");
  		salt = buffer;
  		break;
--- 119,128 ----
  		break;
  
  	default:
  		if ((lc = login_getclass(extra)) == NULL)
  			errx(1, "unable to get login class `%s'",
  			    extra ? (char *)extra : "default");
! 		if (!pwd_gensalt(buffer, _PASSWORD_LEN, lc, 'l'))
  			errx(1, "can't generate salt");
  		salt = buffer;
  		break;