=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/passwd/Attic/pwd_gensalt.c,v retrieving revision 1.12 retrieving revision 1.13 diff -c -r1.12 -r1.13 *** src/usr.bin/passwd/Attic/pwd_gensalt.c 2002/02/16 21:27:50 1.12 --- src/usr.bin/passwd/Attic/pwd_gensalt.c 2002/05/27 21:12:54 1.13 *************** *** 1,4 **** ! /* $OpenBSD: pwd_gensalt.c,v 1.12 2002/02/16 21:27:50 millert Exp $ */ /* * Copyright 1997 Niels Provos * All rights reserved. --- 1,4 ---- ! /* $OpenBSD: pwd_gensalt.c,v 1.13 2002/05/27 21:12:54 itojun Exp $ */ /* * Copyright 1997 Niels Provos * All rights reserved. *************** *** 84,89 **** --- 84,96 ---- grp = getgrgid(pwd->pw_gid); if (grp != NULL) { + snprintf(grpkey, LINE_MAX-1, ":%s", + grp->gr_name); + grpkey[LINE_MAX-1] = 0; + pw_getconf(option, LINE_MAX, grpkey, cipher); + } + if (grp != NULL && *option == 0 && + strchr(pwd->pw_name, '.') == NULL) { snprintf(grpkey, LINE_MAX-1, ".%s", grp->gr_name); grpkey[LINE_MAX-1] = 0;