Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Wrap login.conf database access in ifdef LOGIN_CAP.

Browse Source
This commit is contained in:
mjl 2000-01-12 05:13:32 +00:00
parent e8a1b04582
commit 4b9294447c
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.bin/passwd/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.23 1999/12/23 01:02:52 mjl Exp $
# $NetBSD: Makefile,v 1.24 2000/01/12 05:13:32 mjl Exp $
# from: @(#)Makefile 8.3 (Berkeley) 4/2/94
SRCTOP= ../..
@ -8,7 +8,7 @@ PROG= passwd
SRCS= local_passwd.c yp_passwd.c passwd.c
DPADD+= ${LIBRPCSVC} ${LIBCRYPT} ${LIBUTIL}
LDADD+= -lrpcsvc -lcrypt -lutil
CPPFLAGS+=-I${.CURDIR} -DYP
CPPFLAGS+=-I${.CURDIR} -DYP -DLOGIN_CAP
LINKS= ${BINDIR}/passwd ${BINDIR}/yppasswd
MLINKS= passwd.1 yppasswd.1

8
usr.bin/passwd/local_passwd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: local_passwd.c,v 1.17 2000/01/12 05:04:41 mjl Exp $ */
/* $NetBSD: local_passwd.c,v 1.18 2000/01/12 05:13:32 mjl Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "from: @(#)local_passwd.c 8.3 (Berkeley) 4/2/94";
#else
__RCSID("$NetBSD: local_passwd.c,v 1.17 2000/01/12 05:04:41 mjl Exp $");
__RCSID("$NetBSD: local_passwd.c,v 1.18 2000/01/12 05:13:32 mjl Exp $");
#endif
#endif /* not lint */
@ -147,7 +147,9 @@ local_passwd(uname)
int pfd, tfd;
int min_pw_len = 0;
int pw_expiry = 0;
#ifdef LOGIN_CAP
login_cap_t *lc;
#endif
if (!(pw = getpwnam(uname))) {
warnx("unknown user %s", uname);
@ -166,11 +168,13 @@ local_passwd(uname)
/*
* Get class restrictions for this user, then get the new password.
*/
#ifdef LOGIN_CAP
if((lc = login_getclass(pw->pw_class))) {
min_pw_len = (int) login_getcapnum(lc, "minpasswordlen", 0, 0);
pw_expiry = (int) login_getcaptime(lc, "passwordtime", 0, 0);
login_close(lc);
}
#endif
pw->pw_passwd = getnewpasswd(pw, min_pw_len);
pw->pw_change = pw_expiry ? pw_expiry + time(NULL) : 0;