From owner-freebsd-bugs@FreeBSD.ORG Wed Jan 4 06:30:09 2006 Return-Path: X-Original-To: freebsd-bugs@hub.freebsd.org Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1746316A420 for ; Wed, 4 Jan 2006 06:30:09 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5396643D6D for ; Wed, 4 Jan 2006 06:30:07 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k046U6JW095371 for ; Wed, 4 Jan 2006 06:30:06 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k046U6oC095363; Wed, 4 Jan 2006 06:30:06 GMT (envelope-from gnats) Resent-Date: Wed, 4 Jan 2006 06:30:06 GMT Resent-Message-Id: <200601040630.k046U6oC095363@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Pawel Worach Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 059E116A41F for ; Wed, 4 Jan 2006 06:27:21 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [216.136.204.117]) by mx1.FreeBSD.org (Postfix) with ESMTP id 12F0A43D5E for ; Wed, 4 Jan 2006 06:27:20 +0000 (GMT) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.13.1/8.13.1) with ESMTP id k046RJ3u052124 for ; Wed, 4 Jan 2006 06:27:19 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.13.1/8.13.1/Submit) id k046RJjO052123; Wed, 4 Jan 2006 06:27:19 GMT (envelope-from nobody) Message-Id: <200601040627.k046RJjO052123@www.freebsd.org> Date: Wed, 4 Jan 2006 06:27:19 GMT From: Pawel Worach To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-2.3 Cc: Subject: bin/91299: [patch] add ftpd SITE SHA256 command X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jan 2006 06:30:09 -0000 >Number: 91299 >Category: bin >Synopsis: [patch] add ftpd SITE SHA256 command >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Jan 04 06:30:06 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Pawel Worach >Release: 7.0-CURRENT >Organization: >Environment: [patch] ftpd SITE SHA256 command >Description: Patch to add a "SITE SHA256" command to ftpd similar to the "SITE MD5" command. >How-To-Repeat: >Fix: Index: libexec/ftpd/ftpcmd.y =================================================================== RCS file: /export/ctm/cvs/src/libexec/ftpd/ftpcmd.y,v retrieving revision 1.64 diff -u -u -r1.64 ftpcmd.y --- libexec/ftpd/ftpcmd.y 18 Nov 2004 13:46:29 -0000 1.64 +++ libexec/ftpd/ftpcmd.y 4 Jan 2006 05:29:02 -0000 @@ -64,6 +64,7 @@ #include #include #include +#include #include #include #include @@ -137,7 +138,7 @@ CDUP STOU SMNT SYST SIZE MDTM LPRT LPSV EPRT EPSV - UMASK IDLE CHMOD MDFIVE + UMASK IDLE CHMOD MDFIVE SHATWOFIVESIX LEXERR NOTIMPL @@ -619,6 +620,20 @@ if ($6) free($6); } + | SITE SP SHATWOFIVESIX check_login SP pathname CRLF + { + char p[64], *q; + + if ($4 && $6) { + q = SHA256_File($6, p); + if (q != NULL) + reply(200, "SHA256(%s) = %s", $6, p); + else + perror_reply(550, $6); + } + if ($6) + free($6); + } | SITE SP UMASK check_login CRLF { int oldmask; @@ -1131,6 +1146,7 @@ struct tab sitetab[] = { { "MD5", MDFIVE, STR1, 1, "[ file-name ]" }, + { "SHA256", SHATWOFIVESIX, STR1, 1, "[ file-name ]" }, { "UMASK", UMASK, ARGS, 1, "[ umask ]" }, { "IDLE", IDLE, ARGS, 1, "[ maximum-idle-time ]" }, { "CHMOD", CHMOD, NSTR, 1, " mode file-name" }, Index: libexec/ftpd/ftpd.8 =================================================================== RCS file: /export/ctm/cvs/src/libexec/ftpd/ftpd.8,v retrieving revision 1.69 diff -u -u -r1.69 ftpd.8 --- libexec/ftpd/ftpd.8 18 Jan 2005 09:29:39 -0000 1.69 +++ libexec/ftpd/ftpd.8 4 Jan 2006 05:29:02 -0000 @@ -295,6 +295,7 @@ .It IDLE Ta set idle-timer, e.g. ``SITE IDLE 60'' .It CHMOD Ta "change mode of a file [RW], e.g. ``SITE CHMOD 755 filename''" .It MD5 Ta "report the files MD5 checksum, e.g. ``SITE MD5 filename''" +.It SHA256 Ta "report the files SHA256 checksum, e.g. ``SITE SHA256 filename''" .It HELP Ta give help information .El .Pp >Release-Note: >Audit-Trail: >Unformatted: