[Midnightbsd-cvs] src [10346] sync
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Jun 3 18:50:53 EDT 2018
Revision: 10346
http://svnweb.midnightbsd.org/src/?rev=10346
Author: laffer1
Date: 2018-06-03 18:50:52 -0400 (Sun, 03 Jun 2018)
Log Message:
-----------
sync
Modified Paths:
--------------
trunk/usr.sbin/rpc.yppasswdd/Makefile
trunk/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8
trunk/usr.sbin/rpc.yppasswdd/yppasswd_private.x
trunk/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h
trunk/usr.sbin/rpc.yppasswdd/yppasswdd_main.c
trunk/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
Property Changed:
----------------
trunk/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8
trunk/usr.sbin/rpc.yppasswdd/yppasswd_private.x
trunk/usr.sbin/rpc.yppasswdd/yppwupdate
Modified: trunk/usr.sbin/rpc.yppasswdd/Makefile
===================================================================
--- trunk/usr.sbin/rpc.yppasswdd/Makefile 2018-06-03 22:47:47 UTC (rev 10345)
+++ trunk/usr.sbin/rpc.yppasswdd/Makefile 2018-06-03 22:50:52 UTC (rev 10346)
@@ -1,4 +1,5 @@
-# $FreeBSD: src/usr.sbin/rpc.yppasswdd/Makefile,v 1.21 2004/10/18 21:29:20 ru Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/usr.sbin/rpc.yppasswdd/Makefile 291819 2015-12-04 19:16:56Z bdrewery $
RPCDIR= ${DESTDIR}/usr/include/rpcsvc
@@ -7,7 +8,7 @@
PROG= rpc.yppasswdd
SCRIPTS=yppwupdate
-SCRIPTSDIR= /usr/libexec
+SCRIPTSDIR= ${LIBEXECDIR}
MAN= rpc.yppasswdd.8
SRCS= util.c yp_access.c yp_dblookup.c yp_dbwrite.c \
yp_error.c yppasswdd_main.c yppasswdd_server.c ypxfr_misc.c ${GENSRCS}
Modified: trunk/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8
===================================================================
--- trunk/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8 2018-06-03 22:47:47 UTC (rev 10345)
+++ trunk/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8 2018-06-03 22:50:52 UTC (rev 10346)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
.\" Copyright (c) 1995, 1996
.\" Bill Paul <wpaul at ctr.columbia.edu>. All rights reserved.
.\"
@@ -28,7 +29,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8,v 1.25 2005/02/13 23:45:53 ru Exp $
+.\" $FreeBSD: stable/10/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8 141851 2005-02-13 23:45:54Z ru $
.\"
.Dd February 8, 1996
.Dt RPC.YPPASSWDD 8
Property changes on: trunk/usr.sbin/rpc.yppasswdd/rpc.yppasswdd.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.sbin/rpc.yppasswdd/yppasswd_private.x
===================================================================
--- trunk/usr.sbin/rpc.yppasswdd/yppasswd_private.x 2018-06-03 22:47:47 UTC (rev 10345)
+++ trunk/usr.sbin/rpc.yppasswdd/yppasswd_private.x 2018-06-03 22:50:52 UTC (rev 10346)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 1995, 1996
* Bill Paul <wpaul at ctr.columbia.edu>. All rights reserved.
@@ -32,7 +33,7 @@
#ifndef RPC_HDR
%#include <sys/cdefs.h>
-%__FBSDID("$FreeBSD: src/usr.sbin/rpc.yppasswdd/yppasswd_private.x,v 1.7 2003/05/03 21:06:39 obrien Exp $");
+%__FBSDID("$FreeBSD: stable/10/usr.sbin/rpc.yppasswdd/yppasswd_private.x 114601 2003-05-03 21:06:42Z obrien $");
#endif
#ifdef RPC_HDR
Property changes on: trunk/usr.sbin/rpc.yppasswdd/yppasswd_private.x
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h
===================================================================
--- trunk/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h 2018-06-03 22:47:47 UTC (rev 10345)
+++ trunk/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h 2018-06-03 22:50:52 UTC (rev 10346)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 1995, 1996
* Bill Paul <wpaul at ctr.columbia.edu>. All rights reserved.
@@ -29,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h,v 1.14 2002/07/11 21:28:16 alfred Exp $
+ * $FreeBSD: stable/10/usr.sbin/rpc.yppasswdd/yppasswdd_extern.h 99824 2002-07-11 21:28:16Z alfred $
*/
#ifndef _YPPASSWDD_EXTERN_H
Modified: trunk/usr.sbin/rpc.yppasswdd/yppasswdd_main.c
===================================================================
--- trunk/usr.sbin/rpc.yppasswdd/yppasswdd_main.c 2018-06-03 22:47:47 UTC (rev 10345)
+++ trunk/usr.sbin/rpc.yppasswdd/yppasswdd_main.c 2018-06-03 22:50:52 UTC (rev 10346)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 1995, 1996
* Bill Paul <wpaul at ctr.columbia.edu>. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.sbin/rpc.yppasswdd/yppasswdd_main.c,v 1.26 2005/05/02 14:02:43 delphij Exp $");
+__FBSDID("$FreeBSD: stable/10/usr.sbin/rpc.yppasswdd/yppasswdd_main.c 223492 2011-06-24 07:05:20Z kevlo $");
#include <sys/param.h>
#include <sys/ioctl.h>
Modified: trunk/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
===================================================================
--- trunk/usr.sbin/rpc.yppasswdd/yppasswdd_server.c 2018-06-03 22:47:47 UTC (rev 10345)
+++ trunk/usr.sbin/rpc.yppasswdd/yppasswdd_server.c 2018-06-03 22:50:52 UTC (rev 10346)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 1995, 1996
* Bill Paul <wpaul at ctr.columbia.edu>. All rights reserved.
@@ -31,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.sbin/rpc.yppasswdd/yppasswdd_server.c,v 1.29 2003/06/15 21:24:45 mbr Exp $");
+__FBSDID("$FreeBSD: stable/10/usr.sbin/rpc.yppasswdd/yppasswdd_server.c 301619 2016-06-08 13:49:59Z ngie $");
#include <sys/param.h>
#include <sys/fcntl.h>
@@ -103,7 +104,10 @@
}
t = buf;
-#define EXPAND(e) e = t; while ((*t++ = *p++));
+#define EXPAND(e) do { \
+ e = t; \
+ while ((*t++ = *p++)); \
+} while (0)
EXPAND(yp_password.pw_name);
yp_password.pw_fields |= _PWF_NAME;
EXPAND(yp_password.pw_passwd);
@@ -460,6 +464,7 @@
int passwd_changed = 0;
int shell_changed = 0;
int gecos_changed = 0;
+ char *cryptpw;
char *oldshell = NULL;
char *oldgecos = NULL;
char *passfile_hold;
@@ -537,8 +542,8 @@
/* Step 2: check that the supplied oldpass is valid. */
- if (strcmp(crypt(argp->oldpass, yp_password.pw_passwd),
- yp_password.pw_passwd)) {
+ cryptpw = crypt(argp->oldpass, yp_password.pw_passwd);
+ if (cryptpw == NULL || strcmp(cryptpw, yp_password.pw_passwd)) {
yp_error("rejected change attempt -- bad password");
yp_error("client address: %s username: %s",
inet_ntoa(rqhost->sin_addr),
Index: trunk/usr.sbin/rpc.yppasswdd/yppwupdate
===================================================================
--- trunk/usr.sbin/rpc.yppasswdd/yppwupdate 2018-06-03 22:47:47 UTC (rev 10345)
+++ trunk/usr.sbin/rpc.yppasswdd/yppwupdate 2018-06-03 22:50:52 UTC (rev 10346)
Property changes on: trunk/usr.sbin/rpc.yppasswdd/yppwupdate
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list