Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 13 Sep 2002 12:05:49 -0700
From:      Kris Kennaway <kris@obsecurity.org>
To:        Kevin Oberman <oberman@es.net>
Cc:        fBSD <fBSD@itab.com>, FreeBSD <freebsd-questions@freebsd.org>
Subject:   Re: updated 4.2 > 4.7 Broke sshd
Message-ID:  <20020913190549.GC48486@xor.obsecurity.org>
In-Reply-To: <20020913183546.131235D06@ptavv.es.net>
References:  <B9A77C6F.20731%fBSD@itab.com> <20020913183546.131235D06@ptavv.es.net>

next in thread | previous in thread | raw e-mail | index | archive | help

--3siQDZowHQqNOShm
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

On Fri, Sep 13, 2002 at 11:35:46AM -0700, Kevin Oberman wrote:

> > 7 # mergemaster -i  ###100 [deal with later]s

> Your /etc/pam.conf file is out of date. This should have been updated
> by mergemaster.

Except he told it to ignore all conflicts.

Kris

--3siQDZowHQqNOShm
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.7 (FreeBSD)

iD8DBQE9gjcNWry0BWjoQKURApIqAJ48fLAVz/EzBprxby7Molq2c5LGOACfWMLa
CHAi9b8cDO/fcBkPTRC3NVc=
=P2lf
-----END PGP SIGNATURE-----

--3siQDZowHQqNOShm--

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-questions" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020913190549.GC48486>