From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Jim Porter Newsgroups: gmane.emacs.bugs Subject: bug#59668: 29.0.50; [PATCH] Make 'server-stop-automatically' into a defcustom Date: Tue, 6 Dec 2022 17:39:52 -0800 Message-ID: <6bcebd26-2128-d29c-31e6-e0ee096d9b35@gmail.com> References: <155f479d-3bae-c327-47a3-7b58daf912c0@gmail.com> <83mt87gih4.fsf@gnu.org> <072e4903-4166-ce53-236b-86a8f7e05b9f@gmail.com> <83a645g94i.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------DndFmlWwS6CtGpHF5MKd0zyx" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="28075"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 59668@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Wed Dec 07 02:41:20 2022 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1p2jR1-00076D-BH for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 07 Dec 2022 02:41:19 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p2jQq-00037h-Dr; Tue, 06 Dec 2022 20:41:08 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p2jQn-000377-8S for bug-gnu-emacs@gnu.org; Tue, 06 Dec 2022 20:41:05 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p2jQk-0004vb-L4 for bug-gnu-emacs@gnu.org; Tue, 06 Dec 2022 20:41:04 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p2jQk-0000WC-GM for bug-gnu-emacs@gnu.org; Tue, 06 Dec 2022 20:41:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Jim Porter Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 07 Dec 2022 01:41:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59668 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 59668-submit@debbugs.gnu.org id=B59668.16703772051962 (code B ref 59668); Wed, 07 Dec 2022 01:41:02 +0000 Original-Received: (at 59668) by debbugs.gnu.org; 7 Dec 2022 01:40:05 +0000 Original-Received: from localhost ([127.0.0.1]:46405 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p2jPn-0000Va-Rk for submit@debbugs.gnu.org; Tue, 06 Dec 2022 20:40:05 -0500 Original-Received: from mail-pf1-f173.google.com ([209.85.210.173]:33293) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p2jPk-0000V7-H9 for 59668@debbugs.gnu.org; Tue, 06 Dec 2022 20:40:02 -0500 Original-Received: by mail-pf1-f173.google.com with SMTP id 124so16256215pfy.0 for <59668@debbugs.gnu.org>; Tue, 06 Dec 2022 17:40:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:from:references:cc:to:content-language:subject :mime-version:date:message-id:from:to:cc:subject:date:message-id :reply-to; bh=egEfSd28lB9/yk3I5hMGVSzpBfO9yA5rF86gabf67ok=; b=iQHx8r5QThiGKtV9lv4EzV4jDX2prCfjab0+0He+FqmfQHwxVvly+TSjYXR9QjowlS 5uoULK+X4jCdlDyeqye1CHuFzXSDmqnDBAapdESDghHUuhaet0wd3rEGjbwXf5jUVUDz ymfMoWJibpKMBguV7x/LgBgcIMKgEPmqjoHoW9o5Omgn2b9YAs/FY+CYvSfiGiLv61ah pzaF/iC6IjFgZ6ykaa5bX05hF4G3oyHo4HyqDx1icGs3wTP3yAfEDvCh00bJOIfeaHPc sub8NYRUkclLaWAvLOIFt3tqh1+SvGRaDhIofSx/XQCOHXT07u8Q1rlLFWnm/8eoxEzg 4Jtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:from:references:cc:to:content-language:subject :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=egEfSd28lB9/yk3I5hMGVSzpBfO9yA5rF86gabf67ok=; b=GA7sxBtpBs1HPRlyarNYe8Ydk/fR/v25ZfVYgwzAt1befr39klijh4ur23bsvoByzQ zyLMAzy+tKjVz9ceRx/l4VlnIJ+5u5QpHjCQ7k30qYtgzh7CB14y9AGgNM5y3qAh6nTk 5NIsMs2ysvj59NLAPafYkwd5JhcYx6zeGlEDV6SD8st8sy8rJAOoUNKzoAgKjShICkQW ETF2Xz0TiHWrwsMNhLKXGq5lt4LTIh9rBT/56X1F0QHHKnGkY1b6Ik0pIWhcVS9Rzl12 pA938j3fdDJI6JJ9NM/iku8iwZPOgTioWMwmhaQ/xzB+Ta/9qzzwmypE+5rWtI7esH9A JEKA== X-Gm-Message-State: ANoB5plgxhiFmjqhCATjskKF4szWDaXCHGbIZLRj43a7qdpJOK0YzLy0 EKE5Fq9VHNqUhxPdplIDt1q9sSFQktI= X-Google-Smtp-Source: AA0mqf7EWX5EOLmYre13Jlk2HSHbC3iAJiEZu8uF9NJnZEDtudNwqCNtiq2dL9kf2ZvkkPQRBZ9u7g== X-Received: by 2002:a63:d602:0:b0:478:d2ac:ebda with SMTP id q2-20020a63d602000000b00478d2acebdamr7635987pgg.99.1670377194569; Tue, 06 Dec 2022 17:39:54 -0800 (PST) Original-Received: from [192.168.1.2] (cpe-76-168-148-233.socal.res.rr.com. [76.168.148.233]) by smtp.googlemail.com with ESMTPSA id kb12-20020a17090ae7cc00b0020b21019086sm2891539pjb.3.2022.12.06.17.39.53 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 06 Dec 2022 17:39:53 -0800 (PST) Content-Language: en-US In-Reply-To: <83a645g94i.fsf@gnu.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:250154 Archived-At: This is a multi-part message in MIME format. --------------DndFmlWwS6CtGpHF5MKd0zyx Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 12/2/2022 6:42 AM, Eli Zaretskii wrote: >> Date: Thu, 1 Dec 2022 19:30:03 -0800 >> Cc: 59668@debbugs.gnu.org >> From: Jim Porter >> >> @@ -1805,7 +1814,7 @@ server-save-buffers-kill-terminal >> (t (error "Invalid client frame")))))) >> >> (defun server-stop-automatically--handle-delete-frame (frame) >> - "Handle deletion of FRAME when `server-stop-automatically' is used." >> + "Handle deletion of FRAME when `server-stop-automatically' is `delete-frame'." >> (when server-stop-automatically >> (if (if (and (processp (frame-parameter frame 'client)) >> (eq this-command 'save-buffers-kill-terminal)) >> @@ -1828,7 +1837,7 @@ server-stop-automatically--handle-delete-frame >> (delete-frame frame))))) > > AFAIU, this delete-frame is called after save-buffers-kill-emacs, which is > strange: there will be no Emacs to perform this call after that. What am I > missing? Thanks. I think that's just an oversight. I removed it in my patch for bug#51993, since this seems more closely-related to that bug. >> + (const :tag "When empty" empty) > > "When empty" doesn't explain itself well enough. Can we come up with a > better description? How about "When empty (no clients, unsaved files, or processes)"? That seems a bit clumsy to me, but I wanted to keep the word "empty" in there somehow, since that's the name of the option value. Attached is an updated patch (rebased on top of my previous patches for bug#51993). --------------DndFmlWwS6CtGpHF5MKd0zyx Content-Type: text/plain; charset=UTF-8; name="0001-Make-server-stop-automatically-into-a-defcustom.patch" Content-Disposition: attachment; filename*0="0001-Make-server-stop-automatically-into-a-defcustom.patch" Content-Transfer-Encoding: base64 RnJvbSA3ZDljOWJiY2NmOGZkZjY4NTFhYzNjZjU0MjVjNTY0ZDkxOTE5NDM4IE1vbiBTZXAg MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBKaW0gUG9ydGVyIDxqcG9ydGVyYnVnc0BnbWFpbC5j b20+CkRhdGU6IFN1biwgMjcgTm92IDIwMjIgMjI6MjE6MTAgLTA4MDAKU3ViamVjdDogW1BB VENIXSBNYWtlICdzZXJ2ZXItc3RvcC1hdXRvbWF0aWNhbGx5JyBpbnRvIGEgZGVmY3VzdG9t CgpUaGlzIGNoYW5nZXMgdGhlIG1lYW5pbmcgb2YgdGhlIChmb3JtZXJseSBpbnRlcm5hbCkg dmFyaWFibGUKJ3NlcnZlci1zdG9wLWF1dG9tYXRpY2FsbHknOiBpdCBub3cgYWx3YXlzIGhv bGRzIHRoZSByZXF1ZXN0ZWQKY29uZmlndXJhdGlvbiwgZXZlbiB3aGVuIEVtYWNzIHdhcyBu b3Qgc3RhcnRlZCBhcyBhIGRhZW1vbgooYnVnIzU5NjY4KS4KCiogbGlzcC9zZXJ2ZXIuZWwg KHNlcnZlci1zdG9wLWF1dG9tYXRpY2FsbHkpOiBDb252ZXJ0IHRoZSB2YXJpYWJsZSB0bwph IGRlZmN1c3RvbSwgYW5kIG1ha2UgdGhlIGZ1bmN0aW9uIHNpbXBseSBzZXQgdGhlIGRlZmN1 c3RvbS4KKHNlcnZlci1zdG9wLWF1dG9tYXRpY2FsbHktLXRpbWVyKTogTmV3IHZhcmlhYmxl Lgooc2VydmVyLWFwcGx5LXN0b3AtYXV0b21hdGljYWxseSk6IE5ldyBmdW5jdGlvbi4uLgoo c2VydmVyLXN0b3AsIHNlcnZlci1zdGFydCk6IC4uLiBjYWxsIGl0Lgooc2VydmVyLXNhdmUt YnVmZmVycy1raWxsLXRlcm1pbmFsKTogQWRqdXN0IHRoZSBjb25kaXRpb25zIGZvcgpzdG9w cGluZyBhdXRvbWF0aWNhbGx5IHRvIGFjY291bnQgZm9yIHRoZSBjaGFuZ2Ugb2YgbWVhbmlu ZyBmb3IKJ3NlcnZlci1zdG9wLWF1dG9tYXRpY2FsbHknLgooc2VydmVyLXN0b3AtYXV0b21h dGljYWxseS0taGFuZGxlLWRlbGV0ZS1mcmFtZSk6IFJlbW92ZSB1bm5lY2Vzc2FyeQp0ZXN0 IG9mIHRoZSAnc2VydmVyLXN0b3AtYXV0b21hdGljYWxseScgb3B0aW9uOyB0aGlzIGhvb2sg aXMgb25seSBzZXQKd2hlbiBpdCBzaG91bGQgZG8gaXRzIGpvYi4KKHNlcnZlci1zdG9wLWF1 dG9tYXRpY2FsbHktLW1heWJlLWtpbGwtZW1hY3MpOiBVcGRhdGUgZG9jc3RyaW5nLgoKKiBk b2MvZW1hY3MvbWlzYy50ZXhpIChFbWFjcyBTZXJ2ZXIpOiBVcGRhdGUgZG9jdW1lbnRhdGlv bi4KLS0tCiBkb2MvZW1hY3MvbWlzYy50ZXhpIHwgIDQxICsrKysrKysrLS0tLS0tLS0KIGxp c3Avc2VydmVyLmVsICAgICAgfCAxMTEgKysrKysrKysrKysrKysrKysrKysrKysrKysrKyst LS0tLS0tLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgOTMgaW5zZXJ0aW9ucygrKSwgNTkg ZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZG9jL2VtYWNzL21pc2MudGV4aSBiL2RvYy9l bWFjcy9taXNjLnRleGkKaW5kZXggMjljMGJlZDE5YzAuLjcwMmM3MmJhYzI1IDEwMDY0NAot LS0gYS9kb2MvZW1hY3MvbWlzYy50ZXhpCisrKyBiL2RvYy9lbWFjcy9taXNjLnRleGkKQEAg LTE4MDgsMzEgKzE4MDgsMjggQEAgRW1hY3MgU2VydmVyCiAgIGVtYWNzIC0tZGFlbW9uPWZv bwogQGVuZCBleGFtcGxlCiAKLUBmaW5kZXggc2VydmVyLXN0b3AtYXV0b21hdGljYWxseQor QHZpbmRleCBzZXJ2ZXItc3RvcC1hdXRvbWF0aWNhbGx5CiAgIFRoZSBFbWFjcyBzZXJ2ZXIg Y2FuIG9wdGlvbmFsbHkgYmUgc3RvcHBlZCBhdXRvbWF0aWNhbGx5IHdoZW4KLWNlcnRhaW4g Y29uZGl0aW9ucyBhcmUgbWV0LiAgVG8gZG8gdGhpcywgY2FsbCB0aGUgZnVuY3Rpb24KLUBj b2Rle3NlcnZlci1zdG9wLWF1dG9tYXRpY2FsbHl9IGluIHlvdXIgaW5pdCBmaWxlIChAcHhy ZWZ7SW5pdAotRmlsZX0pLCB3aXRoIG9uZSBvZiB0aGUgZm9sbG93aW5nIGFyZ3VtZW50czoK K2NlcnRhaW4gY29uZGl0aW9ucyBhcmUgbWV0LiAgVG8gZG8gdGhpcywgc2V0IHRoZSBvcHRp b24KK0Bjb2Rle3NlcnZlci1zdG9wLWF1dG9tYXRpY2FsbHl9IHRvIG9uZSBvZiB0aGUgZm9s bG93aW5nIHZhbHVlczoKIAotQGl0ZW1pemUKLUBpdGVtCi1XaXRoIHRoZSBhcmd1bWVudCBA Y29kZXtlbXB0eX0sIHRoZSBzZXJ2ZXIgaXMgc3RvcHBlZCB3aGVuIGl0IGhhcyBubwotY2xp ZW50cywgbm8gdW5zYXZlZCBmaWxlLXZpc2l0aW5nIGJ1ZmZlcnMgYW5kIG5vIHJ1bm5pbmcg cHJvY2Vzc2VzCi1hbnltb3JlLgotCi1AaXRlbQotV2l0aCB0aGUgYXJndW1lbnQgQGNvZGV7 ZGVsZXRlLWZyYW1lfSwgd2hlbiB0aGUgbGFzdCBjbGllbnQgZnJhbWUgaXMKLWJlaW5nIGNs b3NlZCwgeW91IGFyZSBhc2tlZCB3aGV0aGVyIGVhY2ggdW5zYXZlZCBmaWxlLXZpc2l0aW5n IGJ1ZmZlcgotbXVzdCBiZSBzYXZlZCBhbmQgZWFjaCB1bmZpbmlzaGVkIHByb2Nlc3MgY2Fu IGJlIHN0b3BwZWQsIGFuZCBpZiBzbywKLXRoZSBzZXJ2ZXIgaXMgc3RvcHBlZC4KLQotQGl0 ZW0KLVdpdGggdGhlIGFyZ3VtZW50IEBjb2Rle2tpbGwtdGVybWluYWx9LCB3aGVuIHRoZSBs YXN0IGNsaWVudCBmcmFtZSBpcwotYmVpbmcgY2xvc2VkIHdpdGggQGtiZHtDLXggQy1jfSAo QGNvZGV7c2F2ZS1idWZmZXJzLWtpbGwtdGVybWluYWx9KSwKLXlvdSBhcmUgYXNrZWQgd2hl dGhlciBlYWNoIHVuc2F2ZWQgZmlsZS12aXNpdGluZyBidWZmZXIgbXVzdCBiZSBzYXZlZAot YW5kIGVhY2ggdW5maW5pc2hlZCBwcm9jZXNzIGNhbiBiZSBzdG9wcGVkLCBhbmQgaWYgc28s IHRoZSBzZXJ2ZXIgaXMKK0B0YWJsZSBAY29kZQorQGl0ZW0gZW1wdHkKK1RoaXMgdmFsdWUg Y2F1c2VzIHRoZSBzZXJ2ZXIgdG8gYmUgc3RvcHBlZCB3aGVuIGl0IGhhcyBubyBjbGllbnRz LCBubwordW5zYXZlZCBmaWxlLXZpc2l0aW5nIGJ1ZmZlcnMgYW5kIG5vIHJ1bm5pbmcgcHJv Y2Vzc2VzIGFueW1vcmUuCisKK0BpdGVtIGRlbGV0ZS1mcmFtZQorVGhpcyB2YWx1ZSBtZWFu cyB0aGF0IHdoZW4gdGhlIGxhc3QgY2xpZW50IGZyYW1lIGlzIGJlaW5nIGNsb3NlZCwgeW91 CithcmUgYXNrZWQgd2hldGhlciBlYWNoIHVuc2F2ZWQgZmlsZS12aXNpdGluZyBidWZmZXIg bXVzdCBiZSBzYXZlZCBhbmQKK2VhY2ggdW5maW5pc2hlZCBwcm9jZXNzIGNhbiBiZSBzdG9w cGVkLCBhbmQgaWYgc28sIHRoZSBzZXJ2ZXIgaXMKIHN0b3BwZWQuCi1AZW5kIGl0ZW1pemUK KworQGl0ZW0ga2lsbC10ZXJtaW5hbAorVGhpcyB2YWx1ZSBtZWFucyB0aGF0IHdoZW4gdGhl IGxhc3QgY2xpZW50IGZyYW1lIGlzIGJlaW5nIGNsb3NlZCB3aXRoCitAa2Jke0MteCBDLWN9 IChAY29kZXtzYXZlLWJ1ZmZlcnMta2lsbC10ZXJtaW5hbH0pLCB5b3UgYXJlIGFza2VkCit3 aGV0aGVyIGVhY2ggdW5zYXZlZCBmaWxlLXZpc2l0aW5nIGJ1ZmZlciBtdXN0IGJlIHNhdmVk IGFuZCBlYWNoCit1bmZpbmlzaGVkIHByb2Nlc3MgY2FuIGJlIHN0b3BwZWQsIGFuZCBpZiBz bywgdGhlIHNlcnZlciBpcyBzdG9wcGVkLgorQGVuZCB0YWJsZQogCiBAZmluZGV4IHNlcnZl ci1ldmFsLWF0CiAgIElmIHlvdSBoYXZlIGRlZmluZWQgYSBzZXJ2ZXIgYnkgYSB1bmlxdWUg c2VydmVyIG5hbWUsIGl0IGlzIHBvc3NpYmxlCmRpZmYgLS1naXQgYS9saXNwL3NlcnZlci5l bCBiL2xpc3Avc2VydmVyLmVsCmluZGV4IGFhNjJiMjVhODkxLi45NzI2NWMxYTY4YyAxMDA2 NDQKLS0tIGEvbGlzcC9zZXJ2ZXIuZWwKKysrIGIvbGlzcC9zZXJ2ZXIuZWwKQEAgLTI3Myw2 ICsyNzMsMTEgQEAgc2VydmVyLWNsaWVudC1pbnN0cnVjdGlvbnMKICAgOnZlcnNpb24gIjI4 LjEiCiAgIDp0eXBlICdib29sZWFuKQogCisoZGVmdmFyIHNlcnZlci1zdG9wLWF1dG9tYXRp Y2FsbHkpICAgICAgOyBEZWZpbmVkIGJlbG93IHRvIGF2b2lkIHJlY3Vyc2l2ZSBsb2FkLgor CisoZGVmdmFyIHNlcnZlci1zdG9wLWF1dG9tYXRpY2FsbHktLXRpbWVyIG5pbAorICAiVGhl IHRpbWVyIG9iamVjdCBmb3IgYHNlcnZlci1zdG9wLWF1dG9tYXRpY2FsbHktLW1heWJlLWtp bGwtZW1hY3MnLiIpCisKIDs7IFdlIGRvIG5vdCB1c2UgYHRlbXBvcmFyeS1maWxlLWRpcmVj dG9yeScgaGVyZSwgYmVjYXVzZSBlbWFjc2NsaWVudAogOzsgZG9lcyBub3QgcmVhZCB0aGUg aW5pdCBmaWxlLgogKGRlZnZhciBzZXJ2ZXItc29ja2V0LWRpcgpAQCAtNjM2LDcgKzY0MSw4 IEBAIHNlcnZlci1zdG9wCiAgICAgICAoc2V0cSBzdG9wcGVkLXAgdAogICAgICAgICAgICAg c2VydmVyLXByb2Nlc3MgbmlsCiAgICAgICAgICAgICBzZXJ2ZXItbW9kZSBuaWwKLSAgICAg ICAgICAgIGdsb2JhbC1taW5vci1tb2RlcyAoZGVscSAnc2VydmVyLW1vZGUgZ2xvYmFsLW1p bm9yLW1vZGVzKSkpCisgICAgICAgICAgICBnbG9iYWwtbWlub3ItbW9kZXMgKGRlbHEgJ3Nl cnZlci1tb2RlIGdsb2JhbC1taW5vci1tb2RlcykpCisgICAgICAoc2VydmVyLWFwcGx5LXN0 b3AtYXV0b21hdGljYWxseSkpCiAgICAgKHVud2luZC1wcm90ZWN0CiAgICAgICAgIDs7IERl bGV0ZSB0aGUgc29ja2V0IGZpbGVzIG1hZGUgYnkgcHJldmlvdXMgc2VydmVyCiAgICAgICAg IDs7IGludm9jYXRpb25zLgpAQCAtNzU3LDYgKzc2Myw3IEBAIHNlcnZlci1zdGFydAogCQkJ IChsaXN0IDpmYW1pbHkgJ2xvY2FsCiAJCQkgICAgICAgOnNlcnZpY2Ugc2VydmVyLWZpbGUK IAkJCSAgICAgICA6cGxpc3QgJyg6YXV0aGVudGljYXRlZCB0KSkpKSkKKyAgICAgICAgICAo c2VydmVyLWFwcGx5LXN0b3AtYXV0b21hdGljYWxseSkKIAkgICh1bmxlc3Mgc2VydmVyLXBy b2Nlc3MgKGVycm9yICJDb3VsZCBub3Qgc3RhcnQgc2VydmVyIHByb2Nlc3MiKSkKICAgICAg ICAgICAoc2VydmVyLWxvZyAiU3RhcnRlZCBzZXJ2ZXIiKQogCSAgKHByb2Nlc3MtcHV0IHNl cnZlci1wcm9jZXNzIDpzZXJ2ZXItZmlsZSBzZXJ2ZXItZmlsZSkKQEAgLTE3NjksOSArMTc3 Niw2IEBAIHNlcnZlci1zd2l0Y2gtYnVmZmVyCiAgICAgKHdoZW4gc2VydmVyLXJhaXNlLWZy YW1lCiAgICAgICAoc2VsZWN0LWZyYW1lLXNldC1pbnB1dC1mb2N1cyAod2luZG93LWZyYW1l KSkpKSkKIAotKGRlZnZhciBzZXJ2ZXItc3RvcC1hdXRvbWF0aWNhbGx5IG5pbAotICAiSW50 ZXJuYWwgc3RhdHVzIHZhcmlhYmxlIGZvciBgc2VydmVyLXN0b3AtYXV0b21hdGljYWxseScu IikKLQogOzs7IyMjYXV0b2xvYWQKIChkZWZ1biBzZXJ2ZXItc2F2ZS1idWZmZXJzLWtpbGwt dGVybWluYWwgKGFyZykKICAgOzsgQ2FsbGVkIGZyb20gc2F2ZS1idWZmZXJzLWtpbGwtdGVy bWluYWwgaW4gZmlsZXMuZWwuCkBAIC0xNzc5LDExICsxNzgzLDE5IEBAIHNlcnZlci1zYXZl LWJ1ZmZlcnMta2lsbC10ZXJtaW5hbAogV2l0aCBBUkcgbm9uLW5pbCwgc2lsZW50bHkgc2F2 ZSBhbGwgZmlsZS12aXNpdGluZyBidWZmZXJzLCB0aGVuIGtpbGwuCiAKIElmIGVtYWNzY2xp ZW50IHdhcyBzdGFydGVkIHdpdGggYSBsaXN0IG9mIGZpbGVuYW1lcyB0byBlZGl0LCB0aGVu Ci1vbmx5IHRoZXNlIGZpbGVzIHdpbGwgYmUgYXNrZWQgdG8gYmUgc2F2ZWQuIgotICAobGV0 ICgocHJvYyAoZnJhbWUtcGFyYW1ldGVyIG5pbCAnY2xpZW50KSkpCitvbmx5IHRoZXNlIGZp bGVzIHdpbGwgYmUgYXNrZWQgdG8gYmUgc2F2ZWQuCisKK1doZW4gcnVubmluZyBFbWFjcyBh cyBhIGRhZW1vbiBhbmQgd2l0aAorYHNlcnZlci1zdG9wLWF1dG9tYXRpY2FsbHknICh3aGlj aCBzZWUpIHNldCB0byBga2lsbC10ZXJtaW5hbCcgb3IKK2BkZWxldGUtZnJhbWUnLCB0aGlz IGZ1bmN0aW9uIG1heSBjYWxsIGBzYXZlLWJ1ZmZlcnMta2lsbC1lbWFjcycKK2lmIHRoZXJl IGFyZSBubyBvdGhlciBhY3RpdmUgY2xpZW50cy4iCisgIChsZXQgKChzdG9wLWF1dG9tYXRp Y2FsbHkKKyAgICAgICAgIChhbmQgKGRhZW1vbnApCisgICAgICAgICAgICAgIChtZW1xIHNl cnZlci1zdG9wLWF1dG9tYXRpY2FsbHkgJyhraWxsLXRlcm1pbmFsIGRlbGV0ZS1mcmFtZSkp KSkKKyAgICAgICAgKHByb2MgKGZyYW1lLXBhcmFtZXRlciBuaWwgJ2NsaWVudCkpKQogICAg IChjb25kICgoZXEgcHJvYyAnbm93YWl0KQogCSAgIDs7IE5vd2FpdCBmcmFtZXMgaGF2ZSBu byBjbGllbnQgYnVmZmVyIGxpc3QuCi0JICAgKGlmIChsZW5ndGg+IChmcmFtZS1saXN0KSAo aWYgc2VydmVyLXN0b3AtYXV0b21hdGljYWxseSAyIDEpKQorCSAgIChpZiAobGVuZ3RoPiAo ZnJhbWUtbGlzdCkgKGlmIHN0b3AtYXV0b21hdGljYWxseSAyIDEpKQogICAgICAgICAgICAg ICAgOzsgSWYgdGhlcmUgYXJlIGFueSBvdGhlciBmcmFtZXMsIG9ubHkgZGVsZXRlIHRoaXMg b25lLgogICAgICAgICAgICAgICAgOzsgV2hlbiBgc2VydmVyLXN0b3AtYXV0b21hdGljYWxs eScgaXMgc2V0LCBkb24ndCBjb3VudAogICAgICAgICAgICAgICAgOzsgdGhlIGRhZW1vbiBm cmFtZS4KQEAgLTE3OTIsNyArMTgwNCw3IEBAIHNlcnZlci1zYXZlLWJ1ZmZlcnMta2lsbC10 ZXJtaW5hbAogCSAgICAgOzsgSWYgd2UncmUgdGhlIGxhc3QgZnJhbWUgc3RhbmRpbmcsIGtp bGwgRW1hY3MuCiAJICAgICAoc2F2ZS1idWZmZXJzLWtpbGwtZW1hY3MgYXJnKSkpCiAJICAo KHByb2Nlc3NwIHByb2MpCi0gICAgICAgICAgIChpZiAob3IgKG5vdCBzZXJ2ZXItc3RvcC1h dXRvbWF0aWNhbGx5KQorICAgICAgICAgICAoaWYgKG9yIChub3Qgc3RvcC1hdXRvbWF0aWNh bGx5KQogICAgICAgICAgICAgICAgICAgIChsZW5ndGg+IHNlcnZlci1jbGllbnRzIDEpCiAg ICAgICAgICAgICAgICAgICAgKHNlcS1zb21lCiAgICAgICAgICAgICAgICAgICAgIChsYW1i ZGEgKGZyYW1lKQpAQCAtMTgxOSwxNCArMTgzMSwxMyBAQCBzZXJ2ZXItc2F2ZS1idWZmZXJz LWtpbGwtdGVybWluYWwKIAkgICh0IChlcnJvciAiSW52YWxpZCBjbGllbnQgZnJhbWUiKSkp KSkKIAogKGRlZnVuIHNlcnZlci1zdG9wLWF1dG9tYXRpY2FsbHktLWhhbmRsZS1kZWxldGUt ZnJhbWUgKGZyYW1lKQotICAiSGFuZGxlIGRlbGV0aW9uIG9mIEZSQU1FIHdoZW4gYHNlcnZl ci1zdG9wLWF1dG9tYXRpY2FsbHknIGlzIHVzZWQuIgotICAod2hlbiAoYW5kIHNlcnZlci1z dG9wLWF1dG9tYXRpY2FsbHkKLSAgICAgICAgICAgICAobnVsbCAoY2RkciAoZnJhbWUtbGlz dCkpKSkKKyAgIkhhbmRsZSBkZWxldGlvbiBvZiBGUkFNRSB3aGVuIGBzZXJ2ZXItc3RvcC1h dXRvbWF0aWNhbGx5JyBpcyBgZGVsZXRlLWZyYW1lJy4iCisgICh3aGVuIChudWxsIChjZGRy IChmcmFtZS1saXN0KSkpCiAgICAgKGxldCAoKHNlcnZlci1zdG9wLWF1dG9tYXRpY2FsbHkg bmlsKSkKICAgICAgIChzYXZlLWJ1ZmZlcnMta2lsbC1lbWFjcykpKSkKIAogKGRlZnVuIHNl cnZlci1zdG9wLWF1dG9tYXRpY2FsbHktLW1heWJlLWtpbGwtZW1hY3MgKCkKLSAgIkhhbmRs ZSBjbG9zaW5nIG9mIEVtYWNzIGRhZW1vbiB3aGVuIGBzZXJ2ZXItc3RvcC1hdXRvbWF0aWNh bGx5JyBpcyB1c2VkLiIKKyAgIkhhbmRsZSBjbG9zaW5nIG9mIEVtYWNzIGRhZW1vbiB3aGVu IGBzZXJ2ZXItc3RvcC1hdXRvbWF0aWNhbGx5JyBpcyBgZW1wdHknLiIKICAgKHVubGVzcyAo Y2RyIChmcmFtZS1saXN0KSkKICAgICAod2hlbiAoYW5kCiAJICAgKG5vdCAobWVtcSB0ICht YXBjYXIgKGxhbWJkYSAoYikKQEAgLTE4NDAsNDEgKzE4NTEsNjcgQEAgc2VydmVyLXN0b3At YXV0b21hdGljYWxseS0tbWF5YmUta2lsbC1lbWFjcwogCQkJCShwcm9jZXNzLWxpc3QpKSkp KQogICAgICAgKGtpbGwtZW1hY3MpKSkpCiAKLTs7OyMjI2F1dG9sb2FkCi0oZGVmdW4gc2Vy dmVyLXN0b3AtYXV0b21hdGljYWxseSAoYXJnKQotICAiQXV0b21hdGljYWxseSBzdG9wIHNl cnZlciBhcyBzcGVjaWZpZWQgYnkgQVJHLgotCi1JZiBBUkcgaXMgdGhlIHN5bWJvbCBgZW1w dHknLCBzdG9wIHRoZSBzZXJ2ZXIgd2hlbiBpdCBoYXMgbm8KKyhkZWZ1biBzZXJ2ZXItYXBw bHktc3RvcC1hdXRvbWF0aWNhbGx5ICgpCisgICJBcHBseSB0aGUgY3VycmVudCB2YWx1ZSBv ZiBgc2VydmVyLXN0b3AtYXV0b21hdGljYWxseScuCitUaGlzIGZ1bmN0aW9uIGFkZHMgb3Ig cmVtb3ZlcyB0aGUgbmVjZXNzYXJ5IGhlbHBlcnMgdG8gbWFuYWdlCitzdG9wcGluZyB0aGUg RW1hY3Mgc2VydmVyIGF1dG9tYXRpY2FsbHksIGRlcGVuZGluZyBvbiB0aGUgd2hldGhlcgor dGhlIHNlcnZlciBpcyBydW5uaW5nIG9yIG5vdC4gIFRoaXMgZnVuY3Rpb24gb25seSBhcHBs aWVzIHdoZW4KK3J1bm5pbmcgRW1hY3MgYXMgYSBkYWVtb24uIgorICAod2hlbiAoZGFlbW9u cCkKKyAgICAobGV0IChlbXB0eS10aW1lci1wIGRlbGV0ZS1mcmFtZS1wKQorICAgICAgKHdo ZW4gc2VydmVyLXByb2Nlc3MKKyAgICAgICAgKHBjYXNlIHNlcnZlci1zdG9wLWF1dG9tYXRp Y2FsbHkKKyAgICAgICAgICAoJ2VtcHR5ICAgICAgICAoc2V0cSBlbXB0eS10aW1lci1wIHQp KQorICAgICAgICAgICgnZGVsZXRlLWZyYW1lIChzZXRxIGRlbGV0ZS1mcmFtZS1wIHQpKSkp CisgICAgICA7OyBTdGFydCBvciBzdG9wIHRoZSB0aW1lci4KKyAgICAgIChpZiBlbXB0eS10 aW1lci1wCisgICAgICAgICAgKHVubGVzcyBzZXJ2ZXItc3RvcC1hdXRvbWF0aWNhbGx5LS10 aW1lcgorICAgICAgICAgICAgKHNldHEgc2VydmVyLXN0b3AtYXV0b21hdGljYWxseS0tdGlt ZXIKKyAgICAgICAgICAgICAgICAgIChydW4td2l0aC10aW1lcgorICAgICAgICAgICAgICAg ICAgIDEwIDIKKwkJICAgIydzZXJ2ZXItc3RvcC1hdXRvbWF0aWNhbGx5LS1tYXliZS1raWxs LWVtYWNzKSkpCisgICAgICAgICh3aGVuIHNlcnZlci1zdG9wLWF1dG9tYXRpY2FsbHktLXRp bWVyCisgICAgICAgICAgKGNhbmNlbC10aW1lciBzZXJ2ZXItc3RvcC1hdXRvbWF0aWNhbGx5 LS10aW1lcikKKyAgICAgICAgICAoc2V0cSBzZXJ2ZXItc3RvcC1hdXRvbWF0aWNhbGx5LS10 aW1lciBuaWwpKSkKKyAgICAgIDs7IEFkZCBvciByZW1vdmUgdGhlIGRlbGV0ZS1mcmFtZSBo b29rLgorICAgICAgKGlmIGRlbGV0ZS1mcmFtZS1wCisgICAgICAgICAgKGFkZC1ob29rICdk ZWxldGUtZnJhbWUtZnVuY3Rpb25zCisJCSAgICAjJ3NlcnZlci1zdG9wLWF1dG9tYXRpY2Fs bHktLWhhbmRsZS1kZWxldGUtZnJhbWUpCisgICAgICAgIChyZW1vdmUtaG9vayAnZGVsZXRl LWZyYW1lLWZ1bmN0aW9ucworICAgICAgICAgICAgICAgICAgICAgIydzZXJ2ZXItc3RvcC1h dXRvbWF0aWNhbGx5LS1oYW5kbGUtZGVsZXRlLWZyYW1lKSkpKSkKKworKGRlZmN1c3RvbSBz ZXJ2ZXItc3RvcC1hdXRvbWF0aWNhbGx5IG5pbAorICAiSWYgbm9uLW5pbCwgc3RvcCB0aGUg c2VydmVyIHVuZGVyIHRoZSByZXF1ZXN0ZWQgY29uZGl0aW9ucy4KKworSWYgdGhpcyBpcyB0 aGUgc3ltYm9sIGBlbXB0eScsIHN0b3AgdGhlIHNlcnZlciB3aGVuIGl0IGhhcyBubwogcmVt YWluaW5nIGNsaWVudHMsIG5vIHJlbWFpbmluZyB1bnNhdmVkIGZpbGUtdmlzaXRpbmcgYnVm ZmVycywKIGFuZCBubyBydW5uaW5nIHByb2Nlc3NlcyB3aXRoIGEgYHF1ZXJ5LW9uLWV4aXQn IGZsYWcuCiAKLUlmIEFSRyBpcyB0aGUgc3ltYm9sIGBkZWxldGUtZnJhbWUnLCBhc2sgdGhl IHVzZXIgd2hlbiB0aGUgbGFzdAorSWYgdGhpcyBpcyB0aGUgc3ltYm9sIGBkZWxldGUtZnJh bWUnLCBhc2sgdGhlIHVzZXIgd2hlbiB0aGUgbGFzdAogZnJhbWUgaXMgZGVsZXRlZCB3aGV0 aGVyIGVhY2ggdW5zYXZlZCBmaWxlLXZpc2l0aW5nIGJ1ZmZlciBtdXN0CiBiZSBzYXZlZCBh bmQgZWFjaCBydW5uaW5nIHByb2Nlc3Mgd2l0aCBhIGBxdWVyeS1vbi1leGl0JyBmbGFnCiBj YW4gYmUgc3RvcHBlZCwgYW5kIGlmIHNvLCBzdG9wIHRoZSBzZXJ2ZXIgaXRzZWxmLgogCi1J ZiBBUkcgaXMgdGhlIHN5bWJvbCBga2lsbC10ZXJtaW5hbCcsIGFzayB0aGUgdXNlciB3aGVu IHRoZQorSWYgdGhpcyBpcyB0aGUgc3ltYm9sIGBraWxsLXRlcm1pbmFsJywgYXNrIHRoZSB1 c2VyIHdoZW4gdGhlCiB0ZXJtaW5hbCBpcyBraWxsZWQgd2l0aCBcXFtzYXZlLWJ1ZmZlcnMt a2lsbC10ZXJtaW5hbF0gXAogd2hldGhlciBlYWNoIHVuc2F2ZWQgZmlsZS12aXNpdGluZwog YnVmZmVyIG11c3QgYmUgc2F2ZWQgYW5kIGVhY2ggcnVubmluZyBwcm9jZXNzIHdpdGggYSBg cXVlcnktb24tZXhpdCcKLWZsYWcgY2FuIGJlIHN0b3BwZWQsIGFuZCBpZiBzbywgc3RvcCB0 aGUgc2VydmVyIGl0c2VsZi4KLQotQW55IG90aGVyIHZhbHVlIG9mIEFSRyB3aWxsIGNhdXNl IHRoaXMgZnVuY3Rpb24gdG8gc2lnbmFsIGFuIGVycm9yLgotCi1UaGlzIGZ1bmN0aW9uIGlz IG1lYW50IHRvIGJlIGNhbGxlZCBmcm9tIHRoZSB1c2VyIGluaXQgZmlsZS4iCi0gICh3aGVu IChkYWVtb25wKQotICAgIChzZXRxIHNlcnZlci1zdG9wLWF1dG9tYXRpY2FsbHkgYXJnKQot ICAgIChjb25kCi0gICAgICgoZXEgYXJnICdlbXB0eSkKLSAgICAgIChzZXRxIHNlcnZlci1z dG9wLWF1dG9tYXRpY2FsbHkgbmlsKQotICAgICAgKHJ1bi13aXRoLXRpbWVyIDEwIDIKLQkJ ICAgICAgIydzZXJ2ZXItc3RvcC1hdXRvbWF0aWNhbGx5LS1tYXliZS1raWxsLWVtYWNzKSkK LSAgICAgKChlcSBhcmcgJ2RlbGV0ZS1mcmFtZSkKLSAgICAgIChhZGQtaG9vayAnZGVsZXRl LWZyYW1lLWZ1bmN0aW9ucwotCQkjJ3NlcnZlci1zdG9wLWF1dG9tYXRpY2FsbHktLWhhbmRs ZS1kZWxldGUtZnJhbWUpKQotICAgICAoKGVxIGFyZyAna2lsbC10ZXJtaW5hbCkpCi0gICAg ICh0Ci0gICAgICAoZXJyb3IgIlVuZXhwZWN0ZWQgYXJndW1lbnQiKSkpKSkKK2ZsYWcgY2Fu IGJlIHN0b3BwZWQsIGFuZCBpZiBzbywgc3RvcCB0aGUgc2VydmVyIGl0c2VsZi4iCisgIDp0 eXBlICcoY2hvaWNlCisgICAgICAgICAgKGNvbnN0IDp0YWcgIk5ldmVyIiBuaWwpCisgICAg ICAgICAgKGNvbnN0IDp0YWcgIldoZW4gZW1wdHkgKG5vIGNsaWVudHMsIHVuc2F2ZWQgZmls ZXMsIG9yIHByb2Nlc3NlcykiCisgICAgICAgICAgICAgICAgIGVtcHR5KQorICAgICAgICAg IChjb25zdCA6dGFnICJXaGVuIGtpbGxpbmcgbGFzdCB0ZXJtaW5hbCIga2lsbC10ZXJtaW5h bCkKKyAgICAgICAgICAoY29uc3QgOnRhZyAiV2hlbiBraWxsaW5nIGxhc3QgdGVybWluYWwg b3IgZnJhbWUiIGRlbGV0ZS1mcmFtZSkpCisgIDpzZXQgKGxhbWJkYSAoc3ltYm9sIHZhbHVl KQorICAgICAgICAgKHNldC1kZWZhdWx0IHN5bWJvbCB2YWx1ZSkKKyAgICAgICAgIChzZXJ2 ZXItYXBwbHktc3RvcC1hdXRvbWF0aWNhbGx5KSkKKyAgOnZlcnNpb24gIjI5LjEiKQorCiso ZGVmdW4gc2VydmVyLXN0b3AtYXV0b21hdGljYWxseSAodmFsdWUpCisgICJBdXRvbWF0aWNh bGx5IHN0b3AgdGhlIEVtYWNzIHNlcnZlciBhcyBzcGVjaWZpZWQgYnkgVkFMVUUuCitUaGlz IHNldHMgdGhlIHZhcmlhYmxlIGBzZXJ2ZXItc3RvcC1hdXRvbWF0aWNhbGx5JyAod2hpY2gg c2VlKS4iCisgIChzZXRvcHQgc2VydmVyLXN0b3AtYXV0b21hdGljYWxseSB2YWx1ZSkpCiAK IChkZWZpbmUta2V5IGN0bC14LW1hcCAiIyIgJ3NlcnZlci1lZGl0KQogCi0tIAoyLjI1LjEK Cg== --------------DndFmlWwS6CtGpHF5MKd0zyx--