Don't compile pwd_gensalt, it's not needed since we use crypt_checkpass.

ok tedu@

diff --git a/libexec/login_passwd/Makefile b/libexec/login_passwd/Makefile
index 44e4b45..6c03ecf 100644 (file)
--- a/libexec/login_passwd/Makefile
+++ b/libexec/login_passwd/Makefile
@@ -1,12 +1,11 @@
-#      $OpenBSD: Makefile,v 1.5 2006/03/09 19:14:10 millert Exp $
+#      $OpenBSD: Makefile,v 1.6 2015/10/24 13:53:20 ajacoutot Exp $
 
 PROG=  login_passwd
 MAN=   login_passwd.8
-SRCS=  login.c login_passwd.c pwd_gensalt.c
+SRCS=  login.c login_passwd.c
 DPADD= ${LIBUTIL}
 LDADD= -lutil
 CFLAGS+=-Wall -DPASSWD
-.PATH: ${.CURDIR}/../../usr.bin/passwd
 
 BINOWN=        root
 BINGRP=        auth

diff --git a/libexec/login_passwd/common.h b/libexec/login_passwd/common.h
index aeaee7b..b810d69 100644 (file)
--- a/libexec/login_passwd/common.h
+++ b/libexec/login_passwd/common.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: common.h,v 1.5 2015/01/16 06:39:50 deraadt Exp $ */
+/* $OpenBSD: common.h,v 1.6 2015/10/24 13:53:20 ajacoutot Exp $ */
 /*-
  * Copyright (c) 2001 Hans Insulander <hin@openbsd.org>.
  * All rights reserved.
@@ -56,7 +56,6 @@ extern FILE *back;
 
 #ifdef PASSWD
 int pwd_login(char *, char *, char *, int, char *);
-int pwd_gensalt(char *, int, login_cap_t *, char);
 #endif
 #ifdef KRB5
 int krb5_login(char *, char *, char *, int, int, char *);