From patchwork Sat Jan 12 08:15:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hilliard X-Patchwork-Id: 1023852 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=googlegroups.com (client-ip=2607:f8b0:4864:20::e39; helo=mail-vs1-xe39.google.com; envelope-from=swupdate+bncbcl4hcw73qcbbkoe43qqkgqend3pguq@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="GNJfWI9B"; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Cvj7O6y7"; dkim-atps=neutral Received: from mail-vs1-xe39.google.com (mail-vs1-xe39.google.com [IPv6:2607:f8b0:4864:20::e39]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43cCGh1mMrz9s9h for ; Sat, 12 Jan 2019 19:15:39 +1100 (AEDT) Received: by mail-vs1-xe39.google.com with SMTP id p8sf7379553vsd.22 for ; Sat, 12 Jan 2019 00:15:39 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1547280937; cv=pass; d=google.com; s=arc-20160816; b=TXq7OuzRNbYRrY1qpitht90226nwPXttbf/kzDS/NcBk0RrpH57dgv4hML71BbjIMT X3A+YJZnUTL1tlOh1QWHX4eczFGtaeCvqLijSl5s9oviVVt2VAO+nA7lS/RTdlfAx7xK OBADrEMUBb+0CHloulZYTl8+WGr0Pm2vO3J4kR8tyrYM6ki3Bef/FIHZNodHq4S1XzJW tEu6sa9mAgRy7DR0QUO9647/3hKOLc8raSI1WG+PZvKwJfcx0smR86yBtzOoRRTQhadM g0QCRJJD/AiQlDsKxxByXQXw10R37DCPf1ywPrxecMIjtJJ+CdUyTNgxrinbHPAn08QL ZSNQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:message-id:date:subject:cc:to:from :mime-version:sender:dkim-signature:dkim-signature; bh=tvw2Yr0Pst91srCB+ZcPO/hcH6TqwaPzEDjHXl1kf5M=; b=CDM/DdJJt+iyVTuKB3NAWPrHuPzOT+fL8BhlFefmQU0LPB8skJ+YdivfaBTqUAHLDB 0gdtVxx2RRQXZWPrTZz4SZfOM/FEh7qDrS4CI2k5TKDWpWgLvoLR8qbFpEFedFUsMsIe Nq1zjadny6dGi1uY+fARBKSeGGy3/PlTUPKpKfQsLE7v2eAAgSvJXxnti6UX1jH9O0Bf 5alpzxia2IDS3AtyG0qrCqB0M93tYH/h1TzHleGL41p53z9qKZiRyp7ZT/TKb/8ePpeP hHniRR8m8StFq7HU7NIYXDsGGVDyIFU/XlSMLQIi+VM1oogXI1RRt0+dADKG4c3XVSeU x1Xw== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=H3eG3lRx; spf=pass (google.com: domain of james.hilliard1@gmail.com designates 2607:f8b0:4864:20::129 as permitted sender) smtp.mailfrom=james.hilliard1@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:cc:subject:date:message-id :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=tvw2Yr0Pst91srCB+ZcPO/hcH6TqwaPzEDjHXl1kf5M=; b=GNJfWI9BUuP7J4iA1JNjZIDQeXfbmFBKqRl8SEQidCqnGJqHC8GNraZYFQgF5WZxSh xxMBUquRTFoQ/HCka+Kisi0/1VndBr3nq2TFUmo+oM2ecm1lWX0FmK0xIancWrm0AldG o2v4ilWjIKEA1vj2inC6713qgMK2ezJ9pQohOa7IMFr64DbicsFgOci2S5pXGeJfYZhv EIl50fhEaKWLQ5KKvKDy2Mdu0waWKGbdleALwP/phfji3apYGvDHNKC8tntA0XFtKiA2 x4DszGG9ZTXAzdG8sCq5mGKOnTTGl/L4YxPWKbMSpQYZyzYBU7cTmOecTe3/PsNM+vDx H/5Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:to:cc:subject:date:message-id:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-subscribe:list-unsubscribe; bh=tvw2Yr0Pst91srCB+ZcPO/hcH6TqwaPzEDjHXl1kf5M=; b=Cvj7O6y7F4A282PyHKTsyONU63ckEvqIbexIxhAgNp/mF8w/z5C9ZZLrR4lKzQ0Nnl extBLpCMCriccIjuiITiZwLCetf8Y6KsGiagTPhU6l0PdZIW90LgFV0OBvIeCJrzuNa+ 8YTblTmjSVnIzQUx70D/TN7YXeQ63epLbI6dI2r8bT0BMN6txNL9oN1Quhs1q5YES7t9 9JSChPCB70ECMTAbaWy/MVM7y2tEOFqMNTOaL8lvGj6waPBcSJwDWMQBnXcF5BM9or9R 8qiFs+WNBOzrNG6xHVfKVJNNJvwN5V1QYXnz0dZPWLwGtxaan30yhF3VDQaP5QOZewo4 vaBw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:mime-version:from:to:cc:subject:date :message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:x-spam-checked-in-group:list-post :list-help:list-archive:list-subscribe:list-unsubscribe; bh=tvw2Yr0Pst91srCB+ZcPO/hcH6TqwaPzEDjHXl1kf5M=; b=XH1auqM85g5Un2d2FFQTssWwpe+WnGNXDzQ+k218Wti8BtvjaoOBnUu0wCPHt45J9C u7y8AVsQMFYoPmuix4RmCpozAc0zmAZY37OewjAAidVNXl0e7TSveAGK9k5tsm+ZBfQy HCmxzKFRXW7hb8Qfa7OBWAfqSMjODf0xfWAqZ4QJqPJclpDKYdz84RMKdMb1qHMEFYxH Be+dSrWvOp7/8xIl2Kdfr96KX0/om8MdqNIqV7qDLPplkrSvkHK62qaHG9wbfNI3ygK/ +cPz5RQpKhneAJZKHGOQR+ZnuRjvgwafm7hudSAUtaRUZLM/fcwufFqKevUZF0g9xK6I qO/g== Sender: swupdate@googlegroups.com X-Gm-Message-State: AJcUukfg6VLhClxQSSPPBz5j7H1io5GQGVXdAuV/0E3uFhpddTPhSEeW e32H406954+JRbj7R1v5BCM= X-Google-Smtp-Source: ALg8bN53lnVqLNA8o3qaLdvU8XDwSa+ecv9TuXWtyWdaIYK2r/XxeVktU0+FQQ/K3XEYJQvAvEoTOg== X-Received: by 2002:a1f:8204:: with SMTP id e4mr9764vkd.5.1547280937818; Sat, 12 Jan 2019 00:15:37 -0800 (PST) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 2002:a1f:9d0f:: with SMTP id g15ls2654369vke.1.gmail; Sat, 12 Jan 2019 00:15:37 -0800 (PST) X-Received: by 2002:a1f:bfc7:: with SMTP id p190mr2510743vkf.1.1547280937395; Sat, 12 Jan 2019 00:15:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547280937; cv=none; d=google.com; s=arc-20160816; b=VqRqPXSJs7W0fyw06z6VdJbD9ZXXvyfShhW6DXt2aCzSRspg6R91UxUZEXa1wk0Tou 6fQa2Xr/52L/IcmR9tOTZ1qnlSHh8YiyecJsi6a0vxBJFqE5ER3zYlFiqMFSUBbNv4eZ lGv2aZY8zcf+gm/J580aO8a74U9T2om8Nf4klLRBd3VVLNOsbrbaXKu2s0W4EO0QnANr XFx+MLDR1IsHVMU+Iqi9Zh6/CExWCzXNhLMvQ81LfEHQYcI6gXppKffyo/bwuRYcfGSh hAyhGtzTe3Lwd6TbqMPBSj0rommPiY05MVsDfWXpXVr0lAziF3Ga+e3BWxWlFRe45rqF z9zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature; bh=7jjkZu4quqzetARHmucomM4jFzDgX64KKVS4J3uhe98=; b=Y3kUf1g7ulbdHGFQa9wITLs5kkv9zyV0R1U+t+bQtN61zy5SVlct1i1QKMNpJ0sqTb 7JTEdk6PokuK9pzzzvGO8zi20mHyAt+8cAiA1OjiCSzjno/rM0TQx+0tMRG3oUKLKp4z aFsR1Np1ys/wrOc4gr+IdA7G9aITkE6y/MuqHIG+XbGFKbGwzWy575XDYPS2wL9siPsm EfNiMSB8TeMmZVWabaRb2QKRqBtFJ2KW7hK0mRwar/0CGJJo7SqCXrlNJjwJ5qnbzm6r W7RjlvKYYc9XbpMaAX1Ivt0V208vKqFO6iiZYfMqKOvz+77TG4E9lO7xRzwq9RU+dKQk VD6w== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=H3eG3lRx; spf=pass (google.com: domain of james.hilliard1@gmail.com designates 2607:f8b0:4864:20::129 as permitted sender) smtp.mailfrom=james.hilliard1@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from mail-it1-x129.google.com (mail-it1-x129.google.com. [2607:f8b0:4864:20::129]) by gmr-mx.google.com with ESMTPS id x65si5197149vkg.2.2019.01.12.00.15.37 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 Jan 2019 00:15:37 -0800 (PST) Received-SPF: pass (google.com: domain of james.hilliard1@gmail.com designates 2607:f8b0:4864:20::129 as permitted sender) client-ip=2607:f8b0:4864:20::129; Received: by mail-it1-x129.google.com with SMTP id w18so6389109ite.1 for ; Sat, 12 Jan 2019 00:15:37 -0800 (PST) X-Received: by 2002:a02:946e:: with SMTP id a101mr12833343jai.90.1547280936662; Sat, 12 Jan 2019 00:15:36 -0800 (PST) Received: from dragon.Home (71-218-4-112.hlrn.qwest.net. [71.218.4.112]) by smtp.gmail.com with ESMTPSA id a10sm2081333itc.3.2019.01.12.00.15.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 12 Jan 2019 00:15:35 -0800 (PST) From: james.hilliard1@gmail.com To: swupdate@googlegroups.com Cc: James Hilliard Subject: [swupdate] [PATCH 1/1] webserver: fix postupdate default when not using a config file Date: Sat, 12 Jan 2019 16:15:22 +0800 Message-Id: <1547280922-22728-1-git-send-email-james.hilliard1@gmail.com> X-Mailer: git-send-email 2.7.4 X-Original-Sender: james.hilliard1@gmail.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=H3eG3lRx; spf=pass (google.com: domain of james.hilliard1@gmail.com designates 2607:f8b0:4864:20::129 as permitted sender) smtp.mailfrom=james.hilliard1@gmail.com; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , From: James Hilliard We can't set the postupdate default in the mongoose_settings function since mongoose_settings is only run when a config file is present, instead we set it in start_mongoose before mongoose_settings is run. Signed-off-by: James Hilliard Acked-by: stefano Babic --- mongoose/mongoose_interface.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mongoose/mongoose_interface.c b/mongoose/mongoose_interface.c index ef48c00..2ef3f6d 100644 --- a/mongoose/mongoose_interface.c +++ b/mongoose/mongoose_interface.c @@ -492,10 +492,6 @@ static int mongoose_settings(void *elem, void __attribute__ ((__unused__)) *dat if (strlen(tmp)) { opts->auth_domain = strdup(tmp); } - /* - * Default value is active - */ - run_postupdate = true; get_field(LIBCFG_PARSER, elem, "run-postupdate", &run_postupdate); return 0; @@ -556,6 +552,11 @@ int start_mongoose(const char *cfgfname, int argc, char *argv[]) /* No listing directory as default */ opts.listing = false; + /* + * Default value is active + */ + run_postupdate = true; + if (cfgfname) { read_module_settings(cfgfname, "webserver", mongoose_settings, &opts); }