From patchwork Wed Aug 5 14:43:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Darbyshire-Bryant X-Patchwork-Id: 504036 X-Patchwork-Delegate: hauke@hauke-m.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id B39081402C2 for ; Thu, 6 Aug 2015 00:44:44 +1000 (AEST) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 634AA28050F; Wed, 5 Aug 2015 16:44:00 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAD_ENC_HEADER,BAYES_00 autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id A9016280163 for ; Wed, 5 Aug 2015 16:43:48 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 HELO_IP_IN_CL_SUBNET=-1.2 (check from: .darbyshire-bryant. - helo: .emea01-am1-obe.outbound.protection.outlook. - helo-domain: .outlook.) FROM/MX_MATCHES_HELO(DOMAIN)=-2; rate: -7.7 Received: from emea01-am1-obe.outbound.protection.outlook.com (mail-am1on0078.outbound.protection.outlook.com [157.56.112.78]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Wed, 5 Aug 2015 16:43:47 +0200 (CEST) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kevin@darbyshire-bryant.me.uk; Received: from Gonzo.imgworld.org (143.223.8.249) by AM2PR07MB0932.eurprd07.prod.outlook.com (10.162.37.14) with Microsoft SMTP Server (TLS) id 15.1.225.19; Wed, 5 Aug 2015 14:44:17 +0000 From: Kevin Darbyshire-Bryant To: Date: Wed, 5 Aug 2015 15:43:57 +0100 Message-ID: <1438785837-12639-1-git-send-email-kevin@darbyshire-bryant.me.uk> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 X-Originating-IP: [143.223.8.249] X-ClientProxiedBy: HE1PR06CA0006.eurprd06.prod.outlook.com (25.162.181.144) To AM2PR07MB0932.eurprd07.prod.outlook.com (25.162.37.14) X-Microsoft-Exchange-Diagnostics: 1; AM2PR07MB0932; 2:ZffbJkf+vL20OfBYhrDaA7ghGYAoRpyrwNZ8okEr94uXw+nlUyre1IMdHcPfctat4hBhNb802cbN/xjOyqjiBw6ebivaO5hzpjrs4yMhgmkIQe1xSoph/AV67zbMTnDtQw+WXBQUeTL9URAGi8Q39uHW30yVC1qx/iogIuV6gUI=; 3:roCqso2UvWHKNUs2IIMzrvguOD5aOO3npzptX1Pcj2pZU+9DkzeqcEz2tt0rnRA/RnF8BE+4z9i0K2mR3cMtMMTpeqEg8xk6GrG/ioXWda+fDMIoC4yb2LRRRA2D6n52hFvLOnPN3myH1s7UPOf2Ug==; 25:sPxtypu4z79oRbvzle9wKjFlJaaPZNbgf3N9uCN3A3drjycqBP4SDBWDERHaBPylKhVFOYTot1RcFvnT/m4YTSR5odhRJgAp5TY4AMaSIfPr3A3VH5WywmnqmYAHxi31OalCfOusYKrge0dIrTKn6CADNtS4yasgOqUCazcdR+MWbfI+zCtIzYVIgjRcFHPemRZOSFTJ0uOVUkEMP/up5Q82X2ceGOOS9EINL8wjlvtnvtNCvZqL0T/14je4Ke7+2BdWU9fPNcsioO7HbRbM0A==; 4:uz82uhPby9juVGeqnU66sSm3jspYtMuCFvMPdRoSG7CgVxWtGEeOLkSuiP/nGr6+PlFAxWcJrQ03fvIaaDooYjANjvUNfvwVIWSiMc8BmVaA2kFIQl24M7P3xqkSF1efZLkEnOXLbjR8yoEii4tci9zKvuiXKHUyCp10NQYvM6z9p+SESeXUAqcfVBsPOO3j5rY6yTc0y4UE0h2XhWGdAEByQnTPin56C8DjbZpY0kVZ3qBMUl+E73t0RhDbprwVdq6RNSH+DA10vnPp3lXXuNEXyU0NW62BTHBXBSIqYVQ= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:AM2PR07MB0932; 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:AM2PR07MB0932; BCL:0; PCL:0; RULEID:; SRVR:AM2PR07MB0932; X-Forefront-PRVS: 06592CCE58 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(189002)(199003)(64706001)(36756003)(86362001)(77156002)(189998001)(77096005)(69596002)(229853001)(2351001)(106356001)(105586002)(33646002)(50986999)(81156007)(5001830100001)(68736005)(4001540100001)(92566002)(97736004)(107886002)(5001960100002)(110136002)(19580405001)(450100001)(62966003)(87976001)(46102003)(5003940100001)(551544002)(5001860100001)(66066001)(19580395003)(74482002)(50226001)(47776003)(42186005)(122386002)(101416001)(53416004)(40100003)(48376002)(50466002)(4001430100001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM2PR07MB0932; H:Gonzo.imgworld.org; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:3; LANG:en; Received-SPF: None (protection.outlook.com: darbyshire-bryant.me.uk does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM2PR07MB0932; 23:pFAUEo6aZmr7cIaEEGFeP/wI0t0uxknsOw6W/56P8?= =?us-ascii?Q?P+/8gSPnQ6Yp2CD0S1CiCrX941Ur9ysx87oVM1FbMu/k0iRY/vmmdxmUDlqQ?= =?us-ascii?Q?1zdhZffH613r8XVuMQumjPv/hSNJWqdz8BysAge8lsKkFAuECHMcQVfy0yox?= =?us-ascii?Q?RSbKAWFoFDataoHmPgFANVO7g8mSRF5YyOg5d8pBtae5COEmE/oeVscaLBxZ?= =?us-ascii?Q?WStKQHD7DarnZDb1euykNouqySnYoFkMWxU1f9hQDA7vkvX14WGkuQlJzQP6?= =?us-ascii?Q?nbT7m84259PfHuRTQsi0IgBqjwNdSSvh0giBj/O2dR3d+fGhZ+zaqsM53rQH?= =?us-ascii?Q?wftoRvy+e0sXxFeigDhJjKdyjXHX16qKbtoEYn8OPv7YtFv1Z/FABHhjvH+p?= =?us-ascii?Q?rcs5YcC3dhtlOQa7EdBLg6uXOSB+LQuSzZ2SZJv3x6SnRqnBi+zqp7MDxTE5?= =?us-ascii?Q?7060QFv00d2OMIEk38dUKoBzPkbeEwDwzCdS2ocdYVcKRG0oYU4Stw6gQnMt?= =?us-ascii?Q?g0q0n0WgHMeo/j2vNBV34+A3gEKOOhbNov9qoLb7RPAT/wzNIYs/vxLtOw35?= =?us-ascii?Q?zcIWsJ7W6sSiKm7xuP79ieG7Dg75z2xTeqg6F1W5Fhg3aRCP+EL/7/RJyyPq?= =?us-ascii?Q?8ZCedscxMwgKc5HvtxwbH0y7PNQoqQY4pTE5pOAekO+jW2ZHLRorbIpZi7/g?= =?us-ascii?Q?4Gjo1DHIHxvsPxD8FykgouOmYLxJ77OkrvYQ17tPL7rFS1KuEY3PP65mVTzW?= =?us-ascii?Q?GavQbqzUH/y1Lpop4F+h5FVfRqCtV6CWMhyYSwCXlv4bYjqzukrlYYiRb2YF?= =?us-ascii?Q?OuRBAWQJX+hbxDyfEZGlQzg8mS+HBWvs+bGYtexKpe1sFEjTz4WJroRUfLng?= =?us-ascii?Q?LBDhHIpAeOE7eOoxdC6b9BW0lz8pSj7micSAfXtv0p5HgTcKg9FiJVrVwMjP?= =?us-ascii?Q?8GGI5VROO0g8vCacfq1I+KogTI8OO5PoD1hPmmXNtYmxY4HRhSMwAU22Z1w4?= =?us-ascii?Q?LAd4eW0qFHN+rWacrZTdNpHcsY//lrwDA927fbiyE14101LCWKMAH+kHKWHy?= =?us-ascii?Q?TxwWg7eOCVWokUh6fGAo0oWKfo38qOAUCZRUXrPE9xdZ5XPrBJeMDNb5Wauw?= =?us-ascii?Q?cAnt/ezTgzbLh5GIXTpy9N2JvxxIA66u2Bx6ZPKPCCBNo5KxrR2QJzekfFc9?= =?us-ascii?Q?qWbpwT8z1jKDyu9klmn7aTHRNOSWKPvTxSf?= X-Microsoft-Exchange-Diagnostics: 1; AM2PR07MB0932; 5:RTcmcyIStPXdQtVvmdQIoh0WEHe4kMRGFXyFw0LrsdNQMt/FWYM2Eo4zZJYhreI6oYUiVpg4SXJN1fVZfNmkm+Feu8xRuWhVR8fF1IPB/0zidVq8yaWOXs001C/Li/qR4xMRcIcF6iepQXfC1hYcBw==; 24:vC8/3Gcfg1GzAWr2KXrvd26T7+sq3gJXq+lSW+h3wcrragG50rQv2yx+qj0WWYMGPaiRhXXWMxX9u9XhJv2MXiRSq/zB6kwHX63PqCLiuzU=; 20:wVn+WV6DYcpy7mygCjuXRu16/dyna7UUZr7BfMM7ALrcB0crzcbfJfGIoMbzeGJGl8F4psgO6TVt5PIv4/7k9g== SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: darbyshire-bryant.me.uk X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Aug 2015 14:44:17.6835 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM2PR07MB0932 Subject: [OpenWrt-Devel] [PATCH] samba36: preserve smbpasswd across sysupgrade X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Add /etc/samba/smbpasswd to list of samba conffiles thus preserving samba passwords across sysupgrade by default. Signed-off-by: Kevin Darbyshire-Bryant --- package/network/services/samba36/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/package/network/services/samba36/Makefile b/package/network/services/samba36/Makefile index d8b930c..9e282f0 100644 --- a/package/network/services/samba36/Makefile +++ b/package/network/services/samba36/Makefile @@ -129,6 +129,7 @@ MAKE_FLAGS += DYNEXP= PICFLAG= MODULES= define Package/samba36-server/conffiles /etc/config/samba /etc/samba/smb.conf.template +/etc/samba/smbpasswd endef define Package/samba36-server/install