Date: Thu, 21 Mar 2002 15:42:54 -0800 (PST) From: Mark Murray <markm@FreeBSD.org> To: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: cvs commit: src/contrib/opie ftpcmd.y opie.4 opie.h opie_cfg.h opieaccess.5 opieftpd.c opieinfo.1 opieinfo.c opiekey.1 opiekey.c opiepasswd.1 opiepasswd.c src/contrib/opie/libopie challenge.c generator.c hash.c hashlen.c insecure.c lock.c newseed.c Message-ID: <200203212342.g2LNgsp15963@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
markm 2002/03/21 15:42:53 PST
Modified files:
contrib/opie ftpcmd.y opie.4 opie.h opie_cfg.h
opieaccess.5 opieftpd.c opieinfo.1
opieinfo.c opiekey.1 opiekey.c
opiepasswd.1 opiepasswd.c
contrib/opie/libopie challenge.c generator.c hash.c hashlen.c
insecure.c lock.c newseed.c
Log:
Resolve conflicts.
Revision Changes Path
1.4 +4 -3 src/contrib/opie/ftpcmd.y
1.3 +4 -4 src/contrib/opie/libopie/challenge.c
1.5 +329 -37 src/contrib/opie/libopie/generator.c
1.6 +7 -5 src/contrib/opie/libopie/hash.c
1.6 +6 -4 src/contrib/opie/libopie/hashlen.c
1.3 +17 -11 src/contrib/opie/libopie/insecure.c
1.3 +5 -2 src/contrib/opie/libopie/lock.c
1.4 +46 -63 src/contrib/opie/libopie/newseed.c
1.8 +5 -4 src/contrib/opie/opie.4
1.8 +45 -11 src/contrib/opie/opie.h
1.5 +4 -7 src/contrib/opie/opie_cfg.h
1.3 +3 -1 src/contrib/opie/opieaccess.5
1.5 +17 -18 src/contrib/opie/opieftpd.c
1.5 +1 -1 src/contrib/opie/opieinfo.1
1.4 +2 -2 src/contrib/opie/opieinfo.c
1.6 +2 -2 src/contrib/opie/opiekey.1
1.4 +16 -15 src/contrib/opie/opiekey.c
1.5 +3 -2 src/contrib/opie/opiepasswd.1
1.3 +14 -12 src/contrib/opie/opiepasswd.c
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200203212342.g2LNgsp15963>