[Midnightbsd-cvs] src [11146] trunk/contrib/opie: sync
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Jun 26 20:37:32 EDT 2018
Revision: 11146
http://svnweb.midnightbsd.org/src/?rev=11146
Author: laffer1
Date: 2018-06-26 20:37:32 -0400 (Tue, 26 Jun 2018)
Log Message:
-----------
sync
Modified Paths:
--------------
trunk/contrib/opie/ftpcmd.y
trunk/contrib/opie/libmissing/Makefile.in
trunk/contrib/opie/libopie/Makefile.in
trunk/contrib/opie/libopie/challenge.c
trunk/contrib/opie/libopie/generator.c
trunk/contrib/opie/libopie/hash.c
trunk/contrib/opie/libopie/hashlen.c
trunk/contrib/opie/libopie/insecure.c
trunk/contrib/opie/libopie/lock.c
trunk/contrib/opie/libopie/newseed.c
trunk/contrib/opie/libopie/readrec.c
trunk/contrib/opie/libopie/writerec.c
trunk/contrib/opie/opie.4
trunk/contrib/opie/opie.h
trunk/contrib/opie/opie_cfg.h
trunk/contrib/opie/opieaccess.5
trunk/contrib/opie/opieftpd.c
trunk/contrib/opie/opieinfo.1
trunk/contrib/opie/opieinfo.c
trunk/contrib/opie/opiekey.1
trunk/contrib/opie/opiekey.c
trunk/contrib/opie/opiekeys.5
trunk/contrib/opie/opiepasswd.1
trunk/contrib/opie/opiepasswd.c
trunk/contrib/opie/popen.c
Modified: trunk/contrib/opie/ftpcmd.y
===================================================================
--- trunk/contrib/opie/ftpcmd.y 2018-06-27 00:28:24 UTC (rev 11145)
+++ trunk/contrib/opie/ftpcmd.y 2018-06-27 00:37:32 UTC (rev 11146)
@@ -23,7 +23,7 @@
Modified at NRL for OPIE 2.0.
Originally from BSD.
-$FreeBSD$
+$FreeBSD: stable/10/contrib/opie/ftpcmd.y 92914 2002-03-21 23:42:52Z markm $
*/
/*
* Copyright (c) 1985, 1988 Regents of the University of California.
Modified: trunk/contrib/opie/libmissing/Makefile.in
===================================================================
--- trunk/contrib/opie/libmissing/Makefile.in 2018-06-27 00:28:24 UTC (rev 11145)
+++ trunk/contrib/opie/libmissing/Makefile.in 2018-06-27 00:37:32 UTC (rev 11146)
@@ -22,7 +22,7 @@
all: $(TARGET)
$(TARGET): $(OBJS)
- ar cr $(TARGET) $(OBJS)
+ @AR@ @ARFLAGS@ $(TARGET) $(OBJS)
@RANLIB@ $(TARGET)
clean:
Modified: trunk/contrib/opie/libopie/Makefile.in
===================================================================
--- trunk/contrib/opie/libopie/Makefile.in 2018-06-27 00:28:24 UTC (rev 11145)
+++ trunk/contrib/opie/libopie/Makefile.in 2018-06-27 00:37:32 UTC (rev 11146)
@@ -23,7 +23,7 @@
all: $(TARGET)
$(TARGET): $(OBJS)
- ar cr $(TARGET) $(OBJS)
+ @AR@ @ARFLAGS@ $(TARGET) $(OBJS)
@RANLIB@ $(TARGET)
clean:
Modified: trunk/contrib/opie/libopie/challenge.c
===================================================================
--- trunk/contrib/opie/libopie/challenge.c 2018-06-27 00:28:24 UTC (rev 11145)
+++ trunk/contrib/opie/libopie/challenge.c 2018-06-27 00:37:32 UTC (rev 11146)
@@ -21,7 +21,7 @@
Modified by cmetz for OPIE 2.2. Use FUNCTION declaration et al.
Created at NRL for OPIE 2.2 from opiesubr2.c
-$FreeBSD$
+$FreeBSD: stable/10/contrib/opie/libopie/challenge.c 270120 2014-08-18 02:13:45Z ache $
*/
#include "opie_cfg.h"
@@ -68,7 +68,9 @@
}
if (rval ||
- (snprintf(ss, OPIE_CHALLENGE_MAX, "otp-%s %d %s ext", algids[MDX], mp->opie_n - 1, mp->opie_seed) >= OPIE_CHALLENGE_MAX)) {
+ (snprintf(ss, OPIE_CHALLENGE_MAX+1, "otp-%s %d %s ext", algids[MDX], mp->opie_n - 1, mp->opie_seed) >= OPIE_CHALLENGE_MAX+1)) {
+ if (!rval)
+ rval = 1;
opierandomchallenge(ss);
memset(mp, 0, sizeof(*mp));
}
Modified: trunk/contrib/opie/libopie/generator.c
===================================================================
--- trunk/contrib/opie/libopie/generator.c 2018-06-27 00:28:24 UTC (rev 11145)
+++ trunk/contrib/opie/libopie/generator.c 2018-06-27 00:37:32 UTC (rev 11146)
@@ -29,7 +29,7 @@
Bug fixes.
Created at NRL for OPIE 2.2.
-$FreeBSD$
+$FreeBSD: stable/10/contrib/opie/libopie/generator.c 92914 2002-03-21 23:42:52Z markm $
*/
#include "opie_cfg.h"
Modified: trunk/contrib/opie/libopie/hash.c
===================================================================
--- trunk/contrib/opie/libopie/hash.c 2018-06-27 00:28:24 UTC (rev 11145)
+++ trunk/contrib/opie/libopie/hash.c 2018-06-27 00:37:32 UTC (rev 11146)
@@ -14,7 +14,7 @@
they killed thread-safety.
Created by cmetz for OPIE 2.3 using the old hash.c as a guide.
-$FreeBSD$
+$FreeBSD: stable/10/contrib/opie/libopie/hash.c 239169 2012-08-10 04:48:58Z delphij $
*/
#include <sys/endian.h>
Modified: trunk/contrib/opie/libopie/hashlen.c
===================================================================
--- trunk/contrib/opie/libopie/hashlen.c 2018-06-27 00:28:24 UTC (rev 11145)
+++ trunk/contrib/opie/libopie/hashlen.c 2018-06-27 00:37:32 UTC (rev 11146)
@@ -11,7 +11,7 @@
Modified by cmetz for OPIE 2.4. Use struct opie_otpkey, isolate variables.
Created by cmetz for OPIE 2.3.
-$FreeBSD$
+$FreeBSD: stable/10/contrib/opie/libopie/hashlen.c 239169 2012-08-10 04:48:58Z delphij $
*/
#include <sys/endian.h>
Modified: trunk/contrib/opie/libopie/insecure.c
===================================================================
--- trunk/contrib/opie/libopie/insecure.c 2018-06-27 00:28:24 UTC (rev 11145)
+++ trunk/contrib/opie/libopie/insecure.c 2018-06-27 00:37:32 UTC (rev 11146)
@@ -28,7 +28,7 @@
Created at NRL for OPIE 2.2 from opiesubr.c. Fixed pointer
assignment that should have been a comparison.
-$FreeBSD$
+$FreeBSD: stable/10/contrib/opie/libopie/insecure.c 202086 2010-01-11 16:27:56Z ed $
*/
#include "opie_cfg.h"
Modified: trunk/contrib/opie/libopie/lock.c
===================================================================
--- trunk/contrib/opie/libopie/lock.c 2018-06-27 00:28:24 UTC (rev 11145)
+++ trunk/contrib/opie/libopie/lock.c 2018-06-27 00:37:32 UTC (rev 11146)
@@ -29,7 +29,7 @@
Avoid NULL.
Created at NRL for OPIE 2.2 from opiesubr2.c
-$FreeBSD$
+$FreeBSD: stable/10/contrib/opie/libopie/lock.c 92914 2002-03-21 23:42:52Z markm $
*/
#include "opie_cfg.h"
#if HAVE_STRING_H
Modified: trunk/contrib/opie/libopie/newseed.c
===================================================================
--- trunk/contrib/opie/libopie/newseed.c 2018-06-27 00:28:24 UTC (rev 11145)
+++ trunk/contrib/opie/libopie/newseed.c 2018-06-27 00:37:32 UTC (rev 11146)
@@ -14,7 +14,7 @@
Modified by cmetz for OPIE 2.31. Added time.h.
Created by cmetz for OPIE 2.22.
-$FreeBSD$
+$FreeBSD: stable/10/contrib/opie/libopie/newseed.c 109680 2003-01-22 10:55:36Z des $
*/
#include "opie_cfg.h"
Modified: trunk/contrib/opie/libopie/readrec.c
===================================================================
--- trunk/contrib/opie/libopie/readrec.c 2018-06-27 00:28:24 UTC (rev 11145)
+++ trunk/contrib/opie/libopie/readrec.c 2018-06-27 00:37:32 UTC (rev 11146)
@@ -15,7 +15,7 @@
records. Set read flag.
Created by cmetz for OPIE 2.3.
-$FreeBSD: src/contrib/opie/libopie/readrec.c,v 1.2 2005/07/29 09:59:24 ache Exp $
+$FreeBSD: stable/10/contrib/opie/libopie/readrec.c 208586 2010-05-27 03:15:04Z cperciva $
*/
#include "opie_cfg.h"
Modified: trunk/contrib/opie/libopie/writerec.c
===================================================================
--- trunk/contrib/opie/libopie/writerec.c 2018-06-27 00:28:24 UTC (rev 11145)
+++ trunk/contrib/opie/libopie/writerec.c 2018-06-27 00:37:32 UTC (rev 11146)
@@ -14,7 +14,7 @@
support. Fixed passwd bug.
Created by cmetz for OPIE 2.3 from passwd.c.
-$FreeBSD: src/contrib/opie/libopie/writerec.c,v 1.2 2005/07/29 09:59:24 ache Exp $
+$FreeBSD: stable/10/contrib/opie/libopie/writerec.c 148506 2005-07-29 09:59:24Z ache $
*/
#include "opie_cfg.h"
Modified: trunk/contrib/opie/opie.4
===================================================================
--- trunk/contrib/opie/opie.4 2018-06-27 00:28:24 UTC (rev 11145)
+++ trunk/contrib/opie/opie.4 2018-06-27 00:37:32 UTC (rev 11146)
@@ -21,7 +21,7 @@
.\" Definition of "seed" written by Neil Haller of Bellcore
.\" Written at NRL for OPIE 2.0.
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: stable/10/contrib/opie/opie.4 92914 2002-03-21 23:42:52Z markm $
.\"
.TH OPIE 4 "January 10, 1995"
.SH NAME
Modified: trunk/contrib/opie/opie.h
===================================================================
--- trunk/contrib/opie/opie.h 2018-06-27 00:28:24 UTC (rev 11145)
+++ trunk/contrib/opie/opie.h 2018-06-27 00:37:32 UTC (rev 11146)
@@ -37,7 +37,7 @@
Written at Bellcore for the S/Key Version 1 software distribution
(skey.h).
-$FreeBSD$
+$FreeBSD: stable/10/contrib/opie/opie.h 273277 2014-10-19 12:11:25Z antoine $
*/
#ifndef _OPIE_H
#define _OPIE_H 1
Modified: trunk/contrib/opie/opie_cfg.h
===================================================================
--- trunk/contrib/opie/opie_cfg.h 2018-06-27 00:28:24 UTC (rev 11145)
+++ trunk/contrib/opie/opie_cfg.h 2018-06-27 00:37:32 UTC (rev 11146)
@@ -48,7 +48,7 @@
Gutted for autoconf. Split up for autoconf.
Written at NRL for OPIE 2.0.
-$FreeBSD$
+$FreeBSD: stable/10/contrib/opie/opie_cfg.h 92914 2002-03-21 23:42:52Z markm $
*/
#ifndef _OPIE_CFG_H
Modified: trunk/contrib/opie/opieaccess.5
===================================================================
--- trunk/contrib/opie/opieaccess.5 2018-06-27 00:28:24 UTC (rev 11145)
+++ trunk/contrib/opie/opieaccess.5 2018-06-27 00:37:32 UTC (rev 11146)
@@ -13,7 +13,7 @@
.ll 6i
.pl 10.5i
.\" @(#)opieaccess.5 2.0 (NRL) 1/10/95
-.\" $FreeBSD$
+.\" $FreeBSD: stable/10/contrib/opie/opieaccess.5 92914 2002-03-21 23:42:52Z markm $
.\"
.lt 6.0i
.TH OPIEACCESS 5 "January 10, 1995"
Modified: trunk/contrib/opie/opieftpd.c
===================================================================
--- trunk/contrib/opie/opieftpd.c 2018-06-27 00:28:24 UTC (rev 11145)
+++ trunk/contrib/opie/opieftpd.c 2018-06-27 00:37:32 UTC (rev 11146)
@@ -48,7 +48,7 @@
There is some really, really ugly code in here.
-$FreeBSD$
+$FreeBSD: stable/10/contrib/opie/opieftpd.c 92914 2002-03-21 23:42:52Z markm $
*/
/*
* Copyright (c) 1985, 1988, 1990 Regents of the University of California.
Modified: trunk/contrib/opie/opieinfo.1
===================================================================
--- trunk/contrib/opie/opieinfo.1 2018-06-27 00:28:24 UTC (rev 11145)
+++ trunk/contrib/opie/opieinfo.1 2018-06-27 00:37:32 UTC (rev 11146)
@@ -19,7 +19,7 @@
.\" Written at Bellcore for the S/Key Version 1 software distribution
.\" (keyinfo.1).
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: stable/10/contrib/opie/opieinfo.1 92914 2002-03-21 23:42:52Z markm $
.ll 6i
.pl 10.5i
.lt 6.0i
Modified: trunk/contrib/opie/opieinfo.c
===================================================================
--- trunk/contrib/opie/opieinfo.c 2018-06-27 00:28:24 UTC (rev 11145)
+++ trunk/contrib/opie/opieinfo.c 2018-06-27 00:37:32 UTC (rev 11146)
@@ -30,7 +30,7 @@
Written at Bellcore for the S/Key Version 1 software distribution
(keyinfo)
-$FreeBSD$
+$FreeBSD: stable/10/contrib/opie/opieinfo.c 92914 2002-03-21 23:42:52Z markm $
*/
Modified: trunk/contrib/opie/opiekey.1
===================================================================
--- trunk/contrib/opie/opiekey.1 2018-06-27 00:28:24 UTC (rev 11145)
+++ trunk/contrib/opie/opiekey.1 2018-06-27 00:37:32 UTC (rev 11146)
@@ -25,7 +25,7 @@
.\" Written at Bellcore for the S/Key Version 1 software distribution
.\" (key.1).
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: stable/10/contrib/opie/opiekey.1 187920 2009-01-30 15:43:55Z gabor $
.ll 6i
.pl 10.5i
.lt 6.0i
Modified: trunk/contrib/opie/opiekey.c
===================================================================
--- trunk/contrib/opie/opiekey.c 2018-06-27 00:28:24 UTC (rev 11145)
+++ trunk/contrib/opie/opiekey.c 2018-06-27 00:37:32 UTC (rev 11146)
@@ -37,7 +37,7 @@
Written at Bellcore for the S/Key Version 1 software distribution
(skey.c).
-$FreeBSD$
+$FreeBSD: stable/10/contrib/opie/opiekey.c 270120 2014-08-18 02:13:45Z ache $
*/
#include "opie_cfg.h"
@@ -144,7 +144,7 @@
int type = RESPONSE_STANDARD;
int force = 0;
- if (slash = strchr(argv[0], '/'))
+ if (slash = strrchr(argv[0], '/'))
slash++;
else
slash = argv[0];
Modified: trunk/contrib/opie/opiekeys.5
===================================================================
--- trunk/contrib/opie/opiekeys.5 2018-06-27 00:28:24 UTC (rev 11145)
+++ trunk/contrib/opie/opiekeys.5 2018-06-27 00:37:32 UTC (rev 11146)
@@ -14,7 +14,7 @@
.ll 6i
.pl 10.5i
.\" @(#)opiekeys.5 2.0 (NRL) 1/10/95
-.\" $FreeBSD$
+.\" $FreeBSD: stable/10/contrib/opie/opiekeys.5 59121 2000-04-10 11:18:54Z kris $
.\"
.lt 6.0i
.TH OPIEKEYS 5 "January 10, 1995"
Modified: trunk/contrib/opie/opiepasswd.1
===================================================================
--- trunk/contrib/opie/opiepasswd.1 2018-06-27 00:28:24 UTC (rev 11145)
+++ trunk/contrib/opie/opiepasswd.1 2018-06-27 00:37:32 UTC (rev 11146)
@@ -22,7 +22,7 @@
.\" Written at Bellcore for the S/Key Version 1 software distribution
.\" (keyinit.1).
.\"
-.\" $FreeBSD$
+.\" $FreeBSD: stable/10/contrib/opie/opiepasswd.1 92914 2002-03-21 23:42:52Z markm $
.ll 6i
.pl 10.5i
.lt 6.0i
Modified: trunk/contrib/opie/opiepasswd.c
===================================================================
--- trunk/contrib/opie/opiepasswd.c 2018-06-27 00:28:24 UTC (rev 11145)
+++ trunk/contrib/opie/opiepasswd.c 2018-06-27 00:37:32 UTC (rev 11146)
@@ -44,7 +44,7 @@
Written at Bellcore for the S/Key Version 1 software distribution
(skeyinit.c).
- $FreeBSD: src/contrib/opie/opiepasswd.c,v 1.4 2006/03/22 16:00:42 cperciva Exp $
+ $FreeBSD: stable/10/contrib/opie/opiepasswd.c 156997 2006-03-22 16:00:42Z cperciva $
*/
#include "opie_cfg.h"
Modified: trunk/contrib/opie/popen.c
===================================================================
--- trunk/contrib/opie/popen.c 2018-06-27 00:28:24 UTC (rev 11145)
+++ trunk/contrib/opie/popen.c 2018-06-27 00:37:32 UTC (rev 11146)
@@ -23,7 +23,7 @@
Modified at NRL for OPIE 2.0.
Originally from BSD.
-$FreeBSD$
+$FreeBSD: stable/10/contrib/opie/popen.c 117501 2003-07-13 05:59:50Z kris $
*/
/*
* Copyright (c) 1988, 1993, 1994
More information about the Midnightbsd-cvs
mailing list