From 1ef044cbc19e442d06217fee7647c292d7fa900d Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Sun, 25 Oct 2015 08:39:26 +0000 Subject: [PATCH] No need to declare pwd_gensalt; it's unused and gone. ok tedu@ --- libexec/login_chpass/login_chpass.c | 3 +-- libexec/login_lchpass/login_lchpass.c | 3 +-- usr.bin/passwd/local_passwd.c | 3 +-- usr.bin/passwd/yp_passwd.c | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/libexec/login_chpass/login_chpass.c b/libexec/login_chpass/login_chpass.c index 82ed74dc01c..4da3e8b928e 100644 --- a/libexec/login_chpass/login_chpass.c +++ b/libexec/login_chpass/login_chpass.c @@ -1,4 +1,4 @@ -/* $OpenBSD: login_chpass.c,v 1.18 2015/10/22 12:32:33 tedu Exp $ */ +/* $OpenBSD: login_chpass.c,v 1.19 2015/10/25 08:39:26 ajacoutot Exp $ */ /*- * Copyright (c) 1995,1996 Berkeley Software Design, Inc. All rights reserved. @@ -72,7 +72,6 @@ int _yp_check(char **); char *ypgetnewpasswd(struct passwd *, char **); struct passwd *ypgetpwnam(char *); void kbintr(int); -int pwd_gensalt(char *, int, login_cap_t *, char); #endif void local_chpass(char **); diff --git a/libexec/login_lchpass/login_lchpass.c b/libexec/login_lchpass/login_lchpass.c index d4cb4c4f70b..3c79941e623 100644 --- a/libexec/login_lchpass/login_lchpass.c +++ b/libexec/login_lchpass/login_lchpass.c @@ -1,4 +1,4 @@ -/* $OpenBSD: login_lchpass.c,v 1.16 2015/10/22 12:32:33 tedu Exp $ */ +/* $OpenBSD: login_lchpass.c,v 1.17 2015/10/25 08:39:26 ajacoutot Exp $ */ /*- * Copyright (c) 1995,1996 Berkeley Software Design, Inc. All rights reserved. @@ -55,7 +55,6 @@ #define BACK_CHANNEL 3 int local_passwd(char *, int); -int pwd_gensalt(char *, int, login_cap_t *, char); int main(int argc, char *argv[]) diff --git a/usr.bin/passwd/local_passwd.c b/usr.bin/passwd/local_passwd.c index cd20c7a1165..02b173e41e5 100644 --- a/usr.bin/passwd/local_passwd.c +++ b/usr.bin/passwd/local_passwd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: local_passwd.c,v 1.44 2014/11/21 05:13:44 tedu Exp $ */ +/* $OpenBSD: local_passwd.c,v 1.45 2015/10/25 08:39:26 ajacoutot Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -48,7 +48,6 @@ #define UNCHANGED_MSG "Password unchanged.\n" static uid_t uid; -extern int pwd_gensalt(char *, int, login_cap_t *, char); extern int pwd_check(login_cap_t *, char *); extern int pwd_gettries(login_cap_t *); diff --git a/usr.bin/passwd/yp_passwd.c b/usr.bin/passwd/yp_passwd.c index 03e9d50b5bf..d155e92120f 100644 --- a/usr.bin/passwd/yp_passwd.c +++ b/usr.bin/passwd/yp_passwd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: yp_passwd.c,v 1.36 2015/08/20 22:32:41 deraadt Exp $ */ +/* $OpenBSD: yp_passwd.c,v 1.37 2015/10/25 08:39:26 ajacoutot Exp $ */ /* * Copyright (c) 1988 The Regents of the University of California. @@ -54,7 +54,6 @@ #define _PASSWORD_LEN PASS_MAX #endif -extern int pwd_gensalt(char *, int, login_cap_t *, char); extern int pwd_check(login_cap_t *, char *); extern int pwd_gettries(login_cap_t *); extern void kbintr(int); -- 2.20.1