From patchwork Wed Jul 15 09:55:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 495775 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id DB3181401CB for ; Wed, 15 Jul 2015 20:30:33 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 030AFA3C34; Wed, 15 Jul 2015 10:30:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id E9-aXy801l9y; Wed, 15 Jul 2015 10:30:30 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 27563A3DD7; Wed, 15 Jul 2015 10:30:30 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 4FECC1CE5B5 for ; Wed, 15 Jul 2015 10:30:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4902E8B9E2 for ; Wed, 15 Jul 2015 10:30:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KthbtyfCR-62 for ; Wed, 15 Jul 2015 10:30:28 +0000 (UTC) X-Greylist: delayed 00:34:07 by SQLgrey-1.7.6 Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1bon0077.outbound.protection.outlook.com [157.56.111.77]) by whitealder.osuosl.org (Postfix) with ESMTPS id D34D492276 for ; Wed, 15 Jul 2015 10:30:27 +0000 (UTC) Received: from BY2PR03CA011.namprd03.prod.outlook.com (10.255.93.28) by BLUPR03MB081.namprd03.prod.outlook.com (10.255.209.157) with Microsoft SMTP Server (TLS) id 15.1.213.14; Wed, 15 Jul 2015 09:56:18 +0000 Received: from BL2FFO11FD034.protection.gbl (10.255.93.4) by BY2PR03CA011.outlook.office365.com (10.255.93.28) with Microsoft SMTP Server (TLS) id 15.1.219.17 via Frontend Transport; Wed, 15 Jul 2015 09:56:17 +0000 Authentication-Results: spf=fail (sender IP is 137.71.25.55) smtp.mailfrom=crapouillou.net; crapouillou.net; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of crapouillou.net does not designate 137.71.25.55 as permitted sender) receiver=protection.outlook.com; client-ip=137.71.25.55; helo=nwd2mta1.analog.com; Received: from nwd2mta1.analog.com (137.71.25.55) by BL2FFO11FD034.mail.protection.outlook.com (10.173.161.130) with Microsoft SMTP Server (TLS) id 15.1.213.8 via Frontend Transport; Wed, 15 Jul 2015 09:56:16 +0000 Received: from NWD2HUBCAS8.ad.analog.com (nwd2hubcas8.ad.analog.com [10.64.72.141]) by nwd2mta1.analog.com (8.13.8/8.13.8) with ESMTP id t6F9tgNY031282 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL); Wed, 15 Jul 2015 02:55:42 -0700 Received: from zeus.spd.analog.com (10.64.82.11) by NWD2HUBCAS8.ad.analog.com (10.64.72.141) with Microsoft SMTP Server id 14.3.210.2; Wed, 15 Jul 2015 05:55:26 -0400 Received: from carl.ad.analog.com ([10.44.2.243]) by zeus.spd.analog.com (8.15.1/8.15.1) with ESMTP id t6F9tPIO020099; Wed, 15 Jul 2015 05:55:25 -0400 From: To: Date: Wed, 15 Jul 2015 11:55:03 +0200 Message-ID: <1436954103-8380-1-git-send-email-paul@crapouillou.net> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Matching-Connectors: 130814277768550178; (52f37747-95c3-483a-bd05-08d153b03fac); () X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD034; 1:UxrNtPgOw9IiVOQQKUkvqgWJIZ7A34M8lf6yGccjJb+WAhtEMBtVJnQRi63VKbLA7D0AeWEh6NbtmIfBLRoX3FQlr6StdIJ0t8dsdU0qqzADt0FYxiq/T+QA95BkM6ZLRGKKh+1yw13ukom+Zuz/n0ZTO/j6VE9sizbnclikAPWvWfL9WSrLGUxNzytGLy3t19eSmEwQmQW2z7THW53aBw1oAMzeWqlaWwvuUqquB3lOMbCKg9JVt//ZJAGIDwCIIj+ClMVNqTIsetWYtXsXeJD5cTSlYwe8pitOTTBS1Bjv9XI8qLqopv2Du2VB/ihE/h6cuBavXdJx+HeySuRi6DtXLBJE2eBHs3CoQLWkGCD23WOZj491cexMNzVjluzRs7IW4jzkbHSa77Y3jAiR8Pt2PWA0zcGdXFqU9iAw9LtnVnrALIp5RIYz52kPXBmsi/BF7Ynyyb9X7TCSCj8FJA== X-Forefront-Antispam-Report: CIP:137.71.25.55; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(339900001)(189002)(199003)(19580395003)(50466002)(19580405001)(47776003)(229853001)(6806004)(2351001)(46102003)(50986999)(86362001)(85426001)(87936001)(36756003)(86152002)(48376002)(106466001)(189998001)(5003940100001)(50226001)(110136002)(62966003)(5001970100001)(77156002)(92566002)(105606002)(33646002)(5001920100001)(77096005); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR03MB081; H:nwd2mta1.analog.com; FPR:; SPF:Fail; MLV:sfv; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB081; 2:jBcdjahTOoTyLMn5qkdLk0GRLIw0u5LUZ/HPgKWgwEyGdkfvRU0KvYZG8kRg5vr6; 3:sE5TfIJz/w9IXYwlTLrcFj76wVocMGxd9+ROPus1wKRzbjFtxlnv1ru54+HvDDX1jCwEqPWosnag/IUMMd+6+DE4F+0/EgDacRDKCuIQZNLuA+NmQs2N9gGLwQCBPAA3joiNaGhi7E5cgFCLitArlyYPSh1oC6gBZi7K2807yZvMTLKehAwz8PTK0uM4ReJon+OxfUBGAn/mZldYk1u4845Gdyy8vNkqchnyT3AW0Ks=; 25:HBEj1wa1h4Yio878zQNxtKaawLqhAXkfv1yVoBiWPvUMMg4xnSs1/TAADs3Otzv4Sh+zn/VMVvIEpFUDPFL0ISpo86RItQTkvSsWthLceE8dvkCPBybSYxrO4mJ7O8rb3kC4Inr6hovDUfSsQXZp4wT5ASlOIYgaJW2ADlQKaenkDoS8qulqkU/3VB61oG6MZC456SCQtkulT2RgJRGPsdg9BBen9Sw9ifvdkAo6aRozZOTI7Cj6GsM2zDnD0gw+k+5TJlO2Ir6FyUjSYAZgiw==; 4:jw9d1mCjngDFEgcN8H6qCaFDttpzAV7KuyGwNUQZ7KSncGBqb4XxofYggRIPQ2F6574kDDpvDCCJNk7ddANmeSYKbb5z8pEiIdLR/pgQEo0OjdF5GGWi/IbQ9ZdqLoT8ZyGtnUXFSICGBi8+Q6VinNGMmyfjXIkiH5nLPyT0J2J+LhmbJ+TRAzdYM9yqOAidKxUh/xqdVNEeFI76pU/ShPS8XhDoquIe3Ld6YBLvC47G8iuz9vmd71joFHOIHsRcYksCO2UOcGB7ggeo2SDYz9k5Cu0jQ6h2iseI+RtLIZI= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB081; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:BLUPR03MB081; BCL:0; PCL:0; RULEID:(400006); SRVR:BLUPR03MB081; X-Forefront-PRVS: 0638FD5066 X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB081; 23:g1hIEYkAD45Ha1YZLE2aZuSrO+azlQW3rxm/gOVn1avYb/2MMiW6E+l3eCjv/fAzk2tdB897JJ4jbvw5e6HvFHBm1N4hyQ/2XpBicEemQ499cpeoJeoOs0JEhSUGoQUzr5G9McGhcS61e4oQAV/DHMxHP8+tHd3OvwLTyxWeyWCvfkZrDeNoj8K21mgOXxRkvR1ljCsBF96F9nKWK4HaSz+TnK53eEKH/iJF6IClxF41kEI/i2Y1BQC5gTHW7ZquGEpVQhQk050+EC7jkO1re58VR0HnjjvmSmTWuc1NRoOXsDbHaE3MlaJpSv1rIqrp/AuXZx3rk1xJeZ8RZ6caGNV8qe35NH55eEDfhivZhvM1NiqVKDh9U8d6Dt/4K4t4+ecZFn0XkZzS2mC3yJvohA9n5WiVbx2X1LnGeE/8WCdaX9DXlzsxF6bqWpatmdJRLYoRTKObYaIERL1CbAHvS+Bea/UJ6bn4MKJBHkgDRGY64vcM/kYKejNSHoiF1A05v7piC7iBhZaQKJXr1dqBCUiBxWGZK0Vb/F/meSAiYKPPUTfLdHvwWuMuW7oaPxDR7xhCi6+aWjRGxD0qQ0JPtmr55/zK+zOSq/nrHI5KLNybAW5A7kUAUQ2UF16sbS7buCh1Ud3x4ih0rvX4D3T3W55VOIQMLytSnP4pta2OWNPNME8U/s7gLnlIIUNapyd2d/gGxUIe+vAc6PJfmjrtebavmSANeWb2rDohnOfjJ5aT8bMvHHFgu53utMludgZPDJCT90Fdqk544A70q2V9MzTFjLDQClJPWBlCuUqjbQi2QBGBR3ksU+6W6Veu10+Lba+ZyPpkIWgB5+DnH3UheimEiF56SDXm8w38KK1BNzbdAFnVYXnaLmq2+Tdg/CXbbDMqDokTS16jgVnKBAkdXw== X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB081; 5:rVEo8nyHTTyvkhFoFsEz4jlccOdQ2H5Te7SGRXqHb9pOGHuQMNjYwZPQB7pp3LB5eHKfbNYcOCmlx51kVia1mGR64FksH/fvAU2JwbW+SrvHBdbzJc1TKN0D690iRcUQnq3nZNQtmaueCwZ9+sE8M9X0WDDGWN6aWZKKgplc49w=; 24:eTcv+psYHPNEct0X6RmMF0xmzJnrJalrOkGIbeBTMmk7h6OeMRLN1zzSmjxXpsrAUjK6kHHRC3YAnCel7iTRbkzx6c9G/f8RnCoLLDlbIiQ= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jul 2015 09:56:16.7458 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[137.71.25.55]; Helo=[nwd2mta1.analog.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR03MB081 Cc: Paul Cercueil Subject: [Buildroot] [PATCH] package/dropbear: Fix symlink only if pointing to the right directory X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Paul Cercueil This commit ensures that the /etc/dropbear symlink won't be removed if it points elsewhere than /var/run/dropbear. Signed-off-by: Paul Cercueil --- package/dropbear/S50dropbear | 4 ++-- package/dropbear/dropbear.service | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/dropbear/S50dropbear b/package/dropbear/S50dropbear index af50ccf..d42fb60 100644 --- a/package/dropbear/S50dropbear +++ b/package/dropbear/S50dropbear @@ -12,12 +12,12 @@ start() { echo -n "Starting dropbear sshd: " umask 077 - # If /etc/dropbear is not a directory, and + # If /etc/dropbear is a symlink to /var/run/dropbear, and # - the filesystem is RO (i.e. we can not rm the symlink), # create the directory pointed to by the symlink. # - the filesystem is RW (i.e. we can rm the symlink), # replace the symlink with an actual directory - if ! [ -d /etc/dropbear ]; then + if [ "$(readlink /etc/dropbear)" = "/var/run/dropbear" ]; then if rm -f /etc/dropbear; then mkdir -p /etc/dropbear else diff --git a/package/dropbear/dropbear.service b/package/dropbear/dropbear.service index 0e2cf54..62ade1f 100644 --- a/package/dropbear/dropbear.service +++ b/package/dropbear/dropbear.service @@ -3,13 +3,13 @@ Description=Dropbear SSH daemon After=syslog.target network.target auditd.service [Service] -# If /etc/dropbear is not a directory, and +# If /etc/dropbear is a symlink to /var/run/dropbear, and # - the filesystem is RO (i.e. we can not rm the symlink), # create the directory pointed to by the symlink. # - the filesystem is RW (i.e. we can rm the symlink), # replace the symlink with an actual directory ExecStartPre=/bin/sh -c '\ -if ! [ -d /etc/dropbear ]; then \ +if [ "$(readlink /etc/dropbear)" = "/var/run/dropbear" ]; then \ if rm -f /etc/dropbear; then \ mkdir -p /etc/dropbear; \ else \