From owner-freebsd-questions Fri Sep 13 12: 5:53 2002 Delivered-To: freebsd-questions@freebsd.org Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B4E2F37B400 for ; Fri, 13 Sep 2002 12:05:50 -0700 (PDT) Received: from obsecurity.dyndns.org (adsl-64-165-226-88.dsl.lsan03.pacbell.net [64.165.226.88]) by mx1.FreeBSD.org (Postfix) with ESMTP id 4589D43E65 for ; Fri, 13 Sep 2002 12:05:50 -0700 (PDT) (envelope-from kris@obsecurity.org) Received: by obsecurity.dyndns.org (Postfix, from userid 1000) id DC1E866E00; Fri, 13 Sep 2002 12:05:49 -0700 (PDT) Date: Fri, 13 Sep 2002 12:05:49 -0700 From: Kris Kennaway To: Kevin Oberman Cc: fBSD , FreeBSD Subject: Re: updated 4.2 > 4.7 Broke sshd Message-ID: <20020913190549.GC48486@xor.obsecurity.org> References: <20020913183546.131235D06@ptavv.es.net> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="3siQDZowHQqNOShm" Content-Disposition: inline In-Reply-To: <20020913183546.131235D06@ptavv.es.net> User-Agent: Mutt/1.4i Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG --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