From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matthias Fischer To: development@lists.ipfire.org Subject: Re: Betatest Guardian 2.0 Date: Sat, 30 Jul 2016 21:06:19 +0200 Message-ID: <1cb4edb1-4047-afb3-fb27-9d09a133fc76@ipfire.org> In-Reply-To: <1469729150.15771.9.camel@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============1699286625703540945==" List-Id: --===============1699286625703540945== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Hi, I found some typos in '/usr/sbin/guardian'. Didn't know how to do this better, so I'm sending an *attached* patch. In the meantime, 'guardian' is running without seen problems - great work! ;-) Best, Matthias --===============1699286625703540945== Content-Type: text/plain Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="_usr_sbin_guardian_typos.patch" MIME-Version: 1.0 LS0tIG9sZC9ndWFyZGlhbglUaHUgSnVsIDI4IDE5OjI3OjIyIDIwMTYKKysrIG5ldy9ndWFyZGlh bglTYXQgSnVsIDMwIDIwOjU0OjI5IDIwMTYKQEAgLTM3LDcgKzM3LDcgQEAKIAogdXNlIHdhcm5p bmdzOwogCi0jIERpc2FibGUgd2FybmluZ3Mgb2YgdW5qb2luZGVkIHRocmVhZHMgd2hlbiBzdG9w cGluZyBndWFyZGlhbi4KKyMgRGlzYWJsZSB3YXJuaW5ncyBvZiB1bmpvaW5lZCB0aHJlYWRzIHdo ZW4gc3RvcHBpbmcgZ3VhcmRpYW4uCiBubyB3YXJuaW5ncyAndGhyZWFkcyc7CiAKICMgRGVmaW5l IHZlcnNpb24uCkBAIC01OCw3ICs1OCw3IEBACiAJcHJpbnQgIkd1YXJkaWFuICR2ZXJzaW9uIFxu IjsKIAlwcmludCAiVXNhZ2U6IGd1YXJkaWFuIDxvcHRpb25hbCBhcmd1bWVudHM+XG4iOwogCXBy aW50ICIgLWMsIC0tY29uZmlnXHRcdHNwZWNpZml5IGEgY29uZmlndXJhdGlvbiBmaWxlIG90aGVy IHRoYW4gdGhlIGRlZmF1bHQgKC9ldGMvZ3VhcmRpYW4vZ3VhcmRpYW4uY29uZilcbiI7Ci0JcHJp bnQgIiAtZiwgLS1mb3JlZ3JvdW5kXHRydW4gaW4gdGhlIGZvcmVncm91bmQgKGRvZXNuJ3QgZm9y aywgYW55IG91dHB1dCBnb2VzIHRvIFNURE9VVClcbiI7CisJcHJpbnQgIiAtZiwgLS1mb3JlZ3Jv dW5kXHR1cm4gaW4gdGhlIGZvcmVncm91bmQgKGRvZXNuJ3QgZm9yaywgYW55IG91dHB1dCBnb2Vz IHRvIFNURE9VVClcbiI7CiAJcHJpbnQgIiAtaCwgLS1oZWxwXHRcdHNob3dzIHRoaXMgaGVscFxu IjsKIAlwcmludCAiIC12LCAtLXZlcnNpb25cdFx0ZGlzcGxheSBwcm9ncmFtbSB2ZXJzaW9uIGFu ZCBleGl0LlxuIjsKIAlleGl0OwpAQCAtNjksNyArNjksNyBAQAogCiAjIENoZWNrIGlmIGFub3Ro ZXIgaW5zdGFuY2Ugb2YgZ3VhcmRpYW4gaXMgYWxscmVhZHkgcnVubmluZy4KIGlmICgmR3VhcmRp YW46OkRhZW1vbjo6SXNSdW5uaW5nKCkpIHsKLQlkaWUgIkFub3RoZXIgaW5zdGFuY2Ugb2YgR3Vh cmRpYW4gaXMgYWxscmVhZHkgcnVubmluZy4uLlxuIjsKKwlkaWUgIkFub3RoZXIgaW5zdGFuY2Ug b2YgR3VhcmRpYW4gaXMgYWxyZWFkeSBydW5uaW5nLi4uXG4iOwogfQogCiAjIFJlYWQtaW4gdGhl IGNvbmZpZ3VyYXRpb24gZmlsZSBhbmQgc3RvcmUgdGhlIHNldHRpbmdzLgpAQCAtMTgzLDE4ICsx ODMsMTggQEAKICMjIHdpdGggaHVnZSBsb2dmaWxlcywgYXQgaW5pdGlhbGl6YXRpb24gdGltZSBv ZiB0aGUgd29ya2VyIHByb2Nlc3MsIHRoZSBmaWxlIHdpbGwKICMjIGJlIG9wZW5lZCBvbmNlIGFu ZCB0aGUgY3Vyc29yIHBvc2l0aW9uIG9mIHRoZSBlbmQgb2YgZmlsZSAoRU9GKSBnZXQgc3RvcmVk LiBXaGVuCiAjIyByZWFkaW5nIGFueSBuZXdseSBhZGRlZCBsaW5lcyBmcm9tIHRoZSBmaWxlLCB3 ZSBkaXJlY3RseSBjYW4ganVtcCB0byB0aGUgbGFzdAotIyMga25vd24gcG9zaXRpb24gYW5kIGdl dCB0aGVzZSBsaW5lcy4gQWZ0ZXJ3YXJkcywgd2Ugc3RvcmUgdGhlIGN1cnJlbnQgY3Vyc2VyIHBv c2l0aW9uCisjIyBrbm93biBwb3NpdGlvbiBhbmQgZ2V0IHRoZXNlIGxpbmVzLiBBZnRlcndhcmRz LCB3ZSBzdG9yZSB0aGUgY3VycmVudCBjdXJzb3IgcG9zaXRpb24KICMjIGFnYWluLCBzbyB3ZSBj YW4gZG8gaXQgaW4gdGhpcyB3YXkgb3ZlciBhbmQgb3ZlciBhZ2Fpbi4KICMKICMjIEFsbCByZWFk IGxpbmVzIGdldCBzdG9yZWQgaW4gYW4gYXJyYXksIHdoaWNoIHdpbGwgYmUgcGFzc2VkIHRvIHRo ZSBQYXJzZXIuCiAjCi0jIyBJZiBhbnkgcmVzcG9uc2UgKGFjdGlvbikgZnJvbSB0aGUgcGFyc2Vy IGdldCByZWNpZXZlZCwgaXQgd2lsbCBiZSBwdXQgaW50byB0aGUKKyMjIElmIGFueSByZXNwb25z ZSAoYWN0aW9uKSBmcm9tIHRoZSBwYXJzZXIgaXMgcmVjZWl2ZWQsIGl0IHdpbGwgYmUgcHV0IGlu dG8gdGhlCiAjIyBzaGFyZWQgZXZlbnQgcXVldWUuCiAjCiBzdWIgV29ya2VyICgkKSB7CiAJbXkg JGZpbGUgPSAkX1swXTsKIAotCSMgT2J0YWluIHRoZSBwYXJzZXIgbmFtZSB3aGljaCBzaG91bGQg YmUgdXNlZCB0byBwYXJzZXIgYW55CisJIyBPYnRhaW4gdGhlIHBhcnNlciBuYW1lIHdoaWNoIHNo b3VsZCBiZSB1c2VkIHRvIHBhcnNlIGFueQogCSMgbWVzc2FnZXMgb2YgdGhpcyBmaWxlLgogCW15 ICRwYXJzZXIgPSAkbW9uaXRvcmVkX2ZpbGVzeyRmaWxlfTsKIApAQCAtMjE1LDcgKzIxNSw3IEBA CiAKIAkjIEluZmluaXRlIGxvb3AuCiAJd2hpbGUoMSkgewotCQkjIENoZWNrIGlmIHRoZSB3b3Jr ZXJzIHNob3VsZCBwYXVzZSBvciBwZXJmb3JtIGl0J3MgZGVzaXJlZCB3b3JrLgorCQkjIENoZWNr IGlmIHRoZSB3b3JrZXJzIHNob3VsZCBwYXVzZSBvciBwZXJmb3JtIHRoZWlyIGRlc2lyZWQgd29y ay4KIAkJaWYgKCR3b3JrZXJzX3BhdXNlKSB7CiAJCQkjIFdhaXQgMSBzZWNvbmQgdW50aWwgdGhl IG5leHQgY2hlY2suCiAJCQlzbGVlcCgxKTsKQEAgLTI4Niw3ICsyODYsNyBAQAogIyMgU29ja2V0 IGZ1bmN0aW9uLgogIwogIyMgVGhpcyBmdW5jdGlvbiB1c2VzIHRoZSBTb2NrZXQgbW9kdWxlIHRv IGNyZWF0ZSBhbmQgbGlzdGVuIHRvIGFuIFVOSVggc29ja2V0LgotIyMgSXQgYXV0b21hdGljYWxs eSBhY2NlcHRzIGFsbCBpbmNvbW1pbmcgY29ubmVjdGlvbnMgYW5kIHBhc3MgdGhlIHJlY2lldmVk CisjIyBJdCBhdXRvbWF0aWNhbGx5IGFjY2VwdHMgYWxsIGluY29taW5nIGNvbm5lY3Rpb25zIGFu ZCBwYXNzIHRoZSByZWNlaXZlZAogIyMgZGF0YSBtZXNzYWdlcyB0byB0aGUgdGhlIE1lc3NhZ2Vf UGFyc2VyIGZ1bmN0aW9uIHdoaWNoIGlzIGFsc28gcGFydCBvZiB0aGUKICMjIHNvY2tldCBtb2R1 bGUuCiAjCkBAIC0zMDAsMTAgKzMwMCwxMCBAQAogCSMgTG9nIHN1Y2Nlc3NmdWxsIGNyZWF0aW9u IG9mIHNvY2tldC4KIAkkbG9nZ2VyLT5Mb2coImRlYnVnIiwgIkxpc3RlbmluZyB0byBTb2NrZXQu Li4iKTsKIAotICAgICAgICAjIEFjY2VwdCBpbmNvbW1pbmcgY29ubmVjdGlvbnMgZnJvbSB0aGUg c29ja2V0LgorICAgICAgICAjIEFjY2VwdCBpbmNvbWluZyBjb25uZWN0aW9ucyBmcm9tIHRoZSBz b2NrZXQuCiAgICAgICAgIHdoaWxlIChteSAkY29ubmVjdGlvbiA9ICRzZXJ2ZXItPmFjY2VwdCgp KSB7CiAJCSMgQXV0b2ZsdXNoIHRoZSBzb2NrZXQgYWZ0ZXIgdGhlIGRhdGEKLQkJIyBoYXMgYmVl biByZWNpZXZlZC4KKwkJIyBoYXMgYmVlbiByZWNlaXZlZC4KIAkJJGNvbm5lY3Rpb24tPmF1dG9m bHVzaCgxKTsKIAogCQkjIEdhdGhlciBhbGwgZGF0YSBmcm9tIHRoZSBjb25uZWN0aW9uLgpAQCAt MzExLDEwICszMTEsMTAgQEAKIAkJCSMgUmVtb3ZlIGFueSBuZXdsaW5lcy4KIAkJCWNob21wKCRt ZXNzYWdlKTsKIAotCQkJIyBMb2cgcmVjaWV2ZWQgc29ja2V0IGNvbW1hbmQuCisJCQkjIExvZyBy ZWNlaXZlZCBzb2NrZXQgY29tbWFuZC4KIAkJCSRsb2dnZXItPkxvZygiZGVidWciLCAiU29ja2V0 IC0gUmVjaWV2ZWQgbWVzc2FnZTogJG1lc3NhZ2UiKTsKIAotCQkJIyBTZW5kIHRoZSByZWNpZXZl ZCBkYXRhIG1lc3NhZ2UgdG8gdGhlCisJCQkjIFNlbmQgdGhlIHJlY2VpdmVkIGRhdGEgbWVzc2Fn ZSB0byB0aGUKIAkJCSMgc29ja2V0IHBhcnNlci4KIAkJCW15ICRhY3Rpb24gPSAmR3VhcmRpYW46 OlNvY2tldDo6TWVzc2FnZV9QYXJzZXIoJG1lc3NhZ2UpOwogCkBAIC0zMzUsNyArMzM1LDcgQEAK ICMjIEZ1bmN0aW9uIGZvciBjYXB0dXJpbmcgcHJvY2VzcyBzaWduYWxzLgogIwogIyMgVGhpcyBm dW5jdGlvbiBjYXB0dXJlcyBhbnkgc2VudCBwcm9jZXNzIHNpZ25hbHMgYW5kIHdpbGwgY2FsbCB2 YXJpb3VzCi0jIyBhY3Rpb25zLCBiYXNlbmQgb24gdGhlIGNhcHR1cmVkIHNpZ25hbC4KKyMjIGFj dGlvbnMsIGJhc2VkIG9uIHRoZSBjYXB0dXJlZCBzaWduYWwuCiAjCiBzdWIgU2lnbmFsSGFuZGxl ciB7CiAJJFNJR3tJTlR9ID0gXCZTaHV0ZG93bjsKQEAgLTM1OSw3ICszNTksNyBAQAogCSMgTG9v cCB0aHJvdWdoIHRoZSBoYXNoIHdoaWNoIGNvbnRhaW5zIHRoZSBtb25pdG9yZWQgZmlsZXMgYW5k IHN0YXJ0CiAJIyBhIHdvcmtlciB0aHJlYWQgZm9yIGVhY2ggc2luZ2xlIG9uZS4KIAlmb3JlYWNo IG15ICRmaWxlIChrZXlzICVtb25pdG9yZWRfZmlsZXMpIHsKLQkJIyBDaGVjayBpZiBhbiB3b3Jr ZXIgYWxscmVhZHkgaXMgcnVubmluZyBmb3IgdGhpcyBmaWxlLgorCQkjIENoZWNrIGlmIGFuIHdv cmtlciBpcyBhbHJlYWR5IHJ1bm5pbmcgZm9yIHRoaXMgZmlsZS4KIAkJIyBJZiBub3QsIHN0YXJ0 IHRoZSB3b3JrZXIuCiAJCXVubGVzcyAoZXhpc3RzKCRydW5uaW5nX3dvcmtlcnN7JGZpbGV9KSkg ewogCQkJJGxvZ2dlci0+TG9nKCJkZWJ1ZyIsICJTdGFydGluZyB3b3JrZXIgdGhyZWFkIGZvciAk ZmlsZSIpOwpAQCAtMzgwLDcgKzM4MCw3IEBACiAJIyBMb29wIHRocm91Z2ggYWxsIHJ1bm5pbmcg d29ya2Vycy4KIAlmb3JlYWNoIG15ICR3b3JrZXIgKGtleXMgJXJ1bm5pbmdfd29ya2Vycykgewog CQkjIERldGVybWluZSBpZiB0aGUgd29ya2VyIHNob3VsZCBiZSBzdG9wcGVkLgotCQkjIFRoaXMg aGFwcGVuIGlmIHRoZSBmaWxlIHNob3VsZCBub3QgYmUgbG9uZ2VyIG1vbml0b3JlZC4KKwkJIyBU aGlzIGhhcHBlbnMgaWYgdGhlIGZpbGUgc2hvdWxkIG5vdCBiZSBsb25nZXIgbW9uaXRvcmVkLgog CQl1bmxlc3MoZXhpc3RzKCRtb25pdG9yZWRfZmlsZXN7JHdvcmtlcn0pKSB7CiAJCQkkbG9nZ2Vy LT5Mb2coImRlYnVnIiwgIlN0b3BwaW5nIHdvcmtlciB0aHJlYWQgZm9yICR3b3JrZXIiKTsKIApA QCAtNDA4LDcgKzQwOCw3IEBACiAjCiBzdWIgUGF1c2VXb3JrZXJzKCkgewogCSMgU2V0IHdvcmtl cnNfcGF1c2UgdmFyaWFibGUgdG8gIjEiLgotCSMgQWxsIHdvcmtlcnMgd2lsbCBiZSBzbGVlcCB1 bnRpbCB0aGUgdmFyaWFibGUgaGFzIGJlZW4gc2V0IHRvICIwIi4KKwkjIEFsbCB3b3JrZXJzIHdp bGwgc2xlZXAgdW50aWwgdGhlIHZhcmlhYmxlIGhhcyBiZWVuIHNldCB0byAiMCIuCiAJJHdvcmtl cnNfcGF1c2UgPSAxOwogCiAJIyBMb2cgcGF1c2VkIHdvcmtlcnMuCkBAIC00MzgsNyArNDM4LDcg QEAKICMKICMjIFJlbG9hZCBmdW5jdGlvbi4KICMKLSMjIFRoaXMgZnVuY3Rpb24gd2lsbCBnZXQg Y2FsbGVkIGlmIHRoZSBzaWduYWwgaGFuZGxlciByZWNpZXZlcyBhICJTSUdIVVAiIHNpZ25hbCwK KyMjIFRoaXMgZnVuY3Rpb24gd2lsbCBnZXQgY2FsbGVkIGlmIHRoZSBzaWduYWwgaGFuZGxlciBy ZWNlaXZlcyBhICJTSUdIVVAiIHNpZ25hbCwKICMjIG9yIHRoZSByZWxvYWQgY29tbWFuZCB3aWxs IGJlIHNlbnQgdmlhIHNvY2tldCBjb25uZWN0aW9uLiBJdCBpcyByZXNwb25zaWJsZSBmb3IKICMj IHJlbG9hZGluZyBhbGwgY29uZmlndXJlIG9wdGlvbnMgYW5kIHN0b3BwaW5nL3N0YXJ0aW5nIHRo ZSB3b3JrZXIgdGhyZWFkcy4KICMKQEAgLTQ4Myw3ICs0ODMsNyBAQAogIwogIyMgUmVsb2FkSWdu b3JlTGlzdCBmdW5jdGlvbi4KICMKLSMjIFRoaXMgZnVuY3Rpb24gd2lsbCBiZSBjYWxsZWQgaWYg dGhlIHNpZ25hbCBoYW5kbGVyIHJlY2lldmVzIGEgIlNJR1VTUjEiIHNpZ25hbCwKKyMjIFRoaXMg ZnVuY3Rpb24gd2lsbCBiZSBjYWxsZWQgaWYgdGhlIHNpZ25hbCBoYW5kbGVyIHJlY2VpdmVzIGEg IlNJR1VTUjEiIHNpZ25hbCwKICMjIG9yIHRoZSByZWxvYWQtaWdub3JlLWxpc3QgY29tbWFuZCB3 aWxsIGJlIHNlbnQgdmlhIHRoZSBzb2NrZXQgY29ubmVjdGlvbi4gSXQganVzdAogIyMgcGVyZm9y bXMgYSBzaW1wbGUgY2hlY2sgaWYgYW4gaWdub3JlIGZpbGUgaGFzIGJlZW4gY29uZmlndXJlZCBh bmQgY2FsbHMgdGhlIHJlc3BvbnNpYmxlCiAjIyBmdW5jdGlvbiBvbiB0aGUgZXZlbnRzIG1vZHVs ZS4KQEAgLTUwNCw3ICs1MDQsNyBAQAogIwogIyMgVGhpcyBmdW5jdGlvbiBvbmx5IGdldCBjYWxs ZWQgd2hlbiB0aGUgbG9ncm90YXRlIGNvbW1hbmQgd2lsbCBiZSBzZW50IHZpYQogIyMgdGhlIHNv Y2tldCBjb25uZWN0aW9uLiBJdCBpcyByZXNwb25zaWJsZSBmb3IgdmFsaWRhdGluZyBhbmQgYWx0 ZXJpbmcgdGhlIGN1cnJlbnQKLSMjIGN1cnNlciBwb3NpdGlvbnMgb2YgdGhlIG1vbml0b3JlZCBm aWxlcyBhbmQgc3RvcHBpbmcvc3RhcnRpbmcgdGhlIHdvcmtlciB0aHJlYWRzLgorIyMgY3Vyc29y IHBvc2l0aW9ucyBvZiB0aGUgbW9uaXRvcmVkIGZpbGVzIGFuZCBzdG9wcGluZy9zdGFydGluZyB0 aGUgd29ya2VyIHRocmVhZHMuCiAjCiBzdWIgTG9ncm90YXRlICgpIHsKIAkjIFN0b3AgYWxsIHJ1 bm5pbmcgd29ya2Vycy4KQEAgLTU0OSw3ICs1NDksNyBAQAogIyMgU2h1dGRvd24gZnVuY3Rpb24u CiAjCiAjIyBUaGlzIGZ1bmN0aW9uIGlzIHVzZWQgdG8gZG8gYSBjbGVhbiBzaHV0ZG93biBvZiBn dWFyZGlhbi4gSXQgd2lsbCBiZSBjYWxsZWQKLSMjIGJ5IHRoZSBzaWduYWwgaGFuZGxlciB3aGVu IHJlY2lldmluZyBJTlQgKDIpLCBRVUlUICgzKSBhbmQgVEVSTSAoMTUpIHNpZ25hbHMuCisjIyBi eSB0aGUgc2lnbmFsIGhhbmRsZXIgd2hlbiByZWNlaXZpbmcgSU5UICgyKSwgUVVJVCAoMykgYW5k IFRFUk0gKDE1KSBzaWduYWxzLgogIwogc3ViIFNodXRkb3duICgpIHsKIAkjIExvZyBzaHV0ZG93 bi4K --===============1699286625703540945==--