From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36579) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fB2DK-0007KD-Un for qemu-devel@nongnu.org; Tue, 24 Apr 2018 13:58:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fB2DJ-000730-Fg for qemu-devel@nongnu.org; Tue, 24 Apr 2018 13:58:51 -0400 Received: from smtp03.citrix.com ([162.221.156.55]:9785) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fB2DJ-00071c-4o for qemu-devel@nongnu.org; Tue, 24 Apr 2018 13:58:49 -0400 From: Ian Jackson Date: Tue, 24 Apr 2018 18:58:22 +0100 Message-ID: <1524592709-6553-10-git-send-email-ian.jackson@eu.citrix.com> In-Reply-To: <1524592709-6553-1-git-send-email-ian.jackson@eu.citrix.com> References: <1524592709-6553-1-git-send-email-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH 09/16] os-posix: cleanup: Replace fprintfs with error_report in change_process_uid List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Ross Lagerwall , Anthony PERARD , Juergen Gross , Stefano Stabellini , xen-devel@lists.xenproject.org, Ian Jackson , Ian Jackson , Paolo Bonzini , Markus Armbruster , "Daniel P. Berrange" , Michael Tokarev I'm going to be editing this function and it makes sense to clean up this style problem in advance. Signed-off-by: Ian Jackson CC: Paolo Bonzini CC: Markus Armbruster CC: Daniel P. Berrange CC: Michael Tokarev --- os-posix.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/os-posix.c b/os-posix.c index b9c2343..560db95 100644 --- a/os-posix.c +++ b/os-posix.c @@ -167,20 +167,20 @@ static void change_process_uid(void) { if (user_pwd) { if (setgid(user_pwd->pw_gid) < 0) { - fprintf(stderr, "Failed to setgid(%d)\n", user_pwd->pw_gid); + error_report("Failed to setgid(%d)", user_pwd->pw_gid); exit(1); } if (initgroups(user_pwd->pw_name, user_pwd->pw_gid) < 0) { - fprintf(stderr, "Failed to initgroups(\"%s\", %d)\n", - user_pwd->pw_name, user_pwd->pw_gid); + error_report("Failed to initgroups(\"%s\", %d)", + user_pwd->pw_name, user_pwd->pw_gid); exit(1); } if (setuid(user_pwd->pw_uid) < 0) { - fprintf(stderr, "Failed to setuid(%d)\n", user_pwd->pw_uid); + error_report("Failed to setuid(%d)", user_pwd->pw_uid); exit(1); } if (setuid(0) != -1) { - fprintf(stderr, "Dropping privileges failed\n"); + error_report("Dropping privileges failed"); exit(1); } } -- 2.1.4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Jackson Subject: [PATCH 09/16] os-posix: cleanup: Replace fprintfs with error_report in change_process_uid Date: Tue, 24 Apr 2018 18:58:22 +0100 Message-ID: <1524592709-6553-10-git-send-email-ian.jackson@eu.citrix.com> References: <1524592709-6553-1-git-send-email-ian.jackson@eu.citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from all-amaz-eas1.inumbo.com ([34.197.232.57]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1fB2DJ-00040k-Ui for xen-devel@lists.xenproject.org; Tue, 24 Apr 2018 17:58:49 +0000 In-Reply-To: <1524592709-6553-1-git-send-email-ian.jackson@eu.citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: qemu-devel@nongnu.org Cc: Juergen Gross , Stefano Stabellini , "Daniel P. Berrange" , Michael Tokarev , Ian Jackson , Markus Armbruster , Ross Lagerwall , Paolo Bonzini , Anthony PERARD , xen-devel@lists.xenproject.org List-Id: xen-devel@lists.xenproject.org SSdtIGdvaW5nIHRvIGJlIGVkaXRpbmcgdGhpcyBmdW5jdGlvbiBhbmQgaXQgbWFrZXMgc2Vuc2Ug dG8gY2xlYW4gdXAKdGhpcyBzdHlsZSBwcm9ibGVtIGluIGFkdmFuY2UuCgpTaWduZWQtb2ZmLWJ5 OiBJYW4gSmFja3NvbiA8SWFuLkphY2tzb25AZXUuY2l0cml4LmNvbT4KQ0M6IFBhb2xvIEJvbnpp bmkgPHBib256aW5pQHJlZGhhdC5jb20+CkNDOiBNYXJrdXMgQXJtYnJ1c3RlciA8YXJtYnJ1QHJl ZGhhdC5jb20+CkNDOiBEYW5pZWwgUC4gQmVycmFuZ2UgPGJlcnJhbmdlQHJlZGhhdC5jb20+CkND OiBNaWNoYWVsIFRva2FyZXYgPG1qdEB0bHMubXNrLnJ1PgotLS0KIG9zLXBvc2l4LmMgfCAxMCAr KysrKy0tLS0tCiAxIGZpbGUgY2hhbmdlZCwgNSBpbnNlcnRpb25zKCspLCA1IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL29zLXBvc2l4LmMgYi9vcy1wb3NpeC5jCmluZGV4IGI5YzIzNDMuLjU2 MGRiOTUgMTAwNjQ0Ci0tLSBhL29zLXBvc2l4LmMKKysrIGIvb3MtcG9zaXguYwpAQCAtMTY3LDIw ICsxNjcsMjAgQEAgc3RhdGljIHZvaWQgY2hhbmdlX3Byb2Nlc3NfdWlkKHZvaWQpCiB7CiAgICAg aWYgKHVzZXJfcHdkKSB7CiAgICAgICAgIGlmIChzZXRnaWQodXNlcl9wd2QtPnB3X2dpZCkgPCAw KSB7Ci0gICAgICAgICAgICBmcHJpbnRmKHN0ZGVyciwgIkZhaWxlZCB0byBzZXRnaWQoJWQpXG4i LCB1c2VyX3B3ZC0+cHdfZ2lkKTsKKyAgICAgICAgICAgIGVycm9yX3JlcG9ydCgiRmFpbGVkIHRv IHNldGdpZCglZCkiLCB1c2VyX3B3ZC0+cHdfZ2lkKTsKICAgICAgICAgICAgIGV4aXQoMSk7CiAg ICAgICAgIH0KICAgICAgICAgaWYgKGluaXRncm91cHModXNlcl9wd2QtPnB3X25hbWUsIHVzZXJf cHdkLT5wd19naWQpIDwgMCkgewotICAgICAgICAgICAgZnByaW50ZihzdGRlcnIsICJGYWlsZWQg dG8gaW5pdGdyb3VwcyhcIiVzXCIsICVkKVxuIiwKLSAgICAgICAgICAgICAgICAgICAgdXNlcl9w d2QtPnB3X25hbWUsIHVzZXJfcHdkLT5wd19naWQpOworICAgICAgICAgICAgZXJyb3JfcmVwb3J0 KCJGYWlsZWQgdG8gaW5pdGdyb3VwcyhcIiVzXCIsICVkKSIsCisgICAgICAgICAgICAgICAgICAg ICAgICAgdXNlcl9wd2QtPnB3X25hbWUsIHVzZXJfcHdkLT5wd19naWQpOwogICAgICAgICAgICAg ZXhpdCgxKTsKICAgICAgICAgfQogICAgICAgICBpZiAoc2V0dWlkKHVzZXJfcHdkLT5wd191aWQp IDwgMCkgewotICAgICAgICAgICAgZnByaW50ZihzdGRlcnIsICJGYWlsZWQgdG8gc2V0dWlkKCVk KVxuIiwgdXNlcl9wd2QtPnB3X3VpZCk7CisgICAgICAgICAgICBlcnJvcl9yZXBvcnQoIkZhaWxl ZCB0byBzZXR1aWQoJWQpIiwgdXNlcl9wd2QtPnB3X3VpZCk7CiAgICAgICAgICAgICBleGl0KDEp OwogICAgICAgICB9CiAgICAgICAgIGlmIChzZXR1aWQoMCkgIT0gLTEpIHsKLSAgICAgICAgICAg IGZwcmludGYoc3RkZXJyLCAiRHJvcHBpbmcgcHJpdmlsZWdlcyBmYWlsZWRcbiIpOworICAgICAg ICAgICAgZXJyb3JfcmVwb3J0KCJEcm9wcGluZyBwcml2aWxlZ2VzIGZhaWxlZCIpOwogICAgICAg ICAgICAgZXhpdCgxKTsKICAgICAgICAgfQogICAgIH0KLS0gCjIuMS40CgoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlz dApYZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0 Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZlbA==