From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Apr 26 02:00:28 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5A93B16A4CE for ; Mon, 26 Apr 2004 02:00:28 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5113F43D5A for ; Mon, 26 Apr 2004 02:00:28 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i3Q90Sut081066 for ; Mon, 26 Apr 2004 02:00:28 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i3Q90Ssg081065; Mon, 26 Apr 2004 02:00:28 -0700 (PDT) (envelope-from gnats) Resent-Date: Mon, 26 Apr 2004 02:00:28 -0700 (PDT) Resent-Message-Id: <200404260900.i3Q90Ssg081065@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Palle Girgensohn Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 93DAB16A4CE; Mon, 26 Apr 2004 01:54:48 -0700 (PDT) Received: from rambutan.pingpong.net (81.milagro.bahnhof.net [195.178.168.81]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8602743D31; Mon, 26 Apr 2004 01:54:47 -0700 (PDT) (envelope-from girgen@rambutan.pingpong.net) Received: from rambutan.pingpong.net (localhost [127.0.0.1]) i3Q8skL9064281; Mon, 26 Apr 2004 10:54:46 +0200 (CEST) (envelope-from girgen@rambutan.pingpong.net) Received: (from girgen@localhost) by rambutan.pingpong.net (8.12.11/8.12.11/Submit) id i3Q8sk2k064280; Mon, 26 Apr 2004 10:54:46 +0200 (CEST) (envelope-from girgen) Message-Id: <200404260854.i3Q8sk2k064280@rambutan.pingpong.net> Date: Mon, 26 Apr 2004 10:54:46 +0200 (CEST) From: Palle Girgensohn To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 cc: dinoex@FreeBSD.org cc: ache@FreeBSD.org Subject: ports/65980: bugfix for apache's dbmmanage X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Palle Girgensohn List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Apr 2004 09:00:28 -0000 >Number: 65980 >Category: ports >Synopsis: bugfix for apache's dbmmanage >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Apr 26 02:00:27 PDT 2004 >Closed-Date: >Last-Modified: >Originator: Palle Girgensohn >Release: FreeBSD 4.9-STABLE i386 >Organization: Ping Pong AB >Environment: System: FreeBSD rambutan.pingpong.net 4.9-STABLE FreeBSD 4.9-STABLE #1: Tue Mar 16 00:35:48 CET 2004 girgen@rambutan.pingpong.net:/.a/banan/usr/obj/usr/src/sys/ASUS i386 >Description: dbmmanage doesn't recognize the $1$ md5 prefix used by FreeBSD when checking a password using "dbmmanage passwdfile check". This patch fixes this. Also I supply a bonus patch, that patches rotatelogs to always keep a hardlink to the latest log file, but without the seconds-since-epoch integer. Just as a convenience - when developing web apps, it makes it easier to just check the log file. It would be nice to have this in the ports tree. >How-To-Repeat: >Fix: These two patch files should be added to ports/www/apache13/files and ports/www/apache13-modssl/files, at least. -------------------------------------------------------------- --- src/support/dbmmanage~ Tue Oct 10 06:23:58 2000 +++ src/support/dbmmanage Sun Dec 3 00:45:08 2000 @@ -338,7 +338,7 @@ } elsif (substr($chkpass, 0, 5) eq '{SHA}') { need_sha1_crypt; $crypt_method = "sha1"; - } elsif (length($chkpass) == 13 && $chkpass ne $testpass) { + } elsif ((length($chkpass) == 13 && $chkpass ne $testpass) || ($chkpass =~ m/^\$[0-9]\$/)) { $crypt_method = "crypt"; } else { $crypt_method = "plain"; -------------------------------------------------------------- -------------------------------------------------------------- --- src/support/rotatelogs.c~ Mon Aug 3 11:15:33 1998 +++ src/support/rotatelogs.c Sun Mar 26 22:42:40 2000 @@ -11,6 +11,7 @@ #include #include #include +#include #define BUFSIZE 65536 #define ERRMSGSZ 82 @@ -95,6 +96,8 @@ } else { close(nLogFDprev); + unlink(szLogRoot); + link(buf2, szLogRoot); } nMessCount = 0; } -------------------------------------------------------------- >Release-Note: >Audit-Trail: >Unformatted: