From patchwork Wed Jan 23 13:37:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Synacek X-Patchwork-Id: 214948 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id B617C2C007E for ; Thu, 24 Jan 2013 00:38:12 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754974Ab3AWNiE (ORCPT ); Wed, 23 Jan 2013 08:38:04 -0500 Received: from mx1.redhat.com ([209.132.183.28]:6167 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754629Ab3AWNhy (ORCPT ); Wed, 23 Jan 2013 08:37:54 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r0NDbrD5011220 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 23 Jan 2013 08:37:53 -0500 Received: from jsynacek-ntb.brq.redhat.com (dhcp-25-239.brq.redhat.com [10.34.25.239]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r0NDbmXB028148; Wed, 23 Jan 2013 08:37:52 -0500 From: Jan Synacek To: yoshfuji@linux-ipv6.org Cc: netdev@vger.kernel.org, Jan Synacek Subject: [PATCH 1/2] ninfod: Call limit/drop_capabilities() and open_sock() after checking for -h or -v. Date: Wed, 23 Jan 2013 14:37:44 +0100 Message-Id: <1358948265-20867-2-git-send-email-jsynacek@redhat.com> In-Reply-To: <1358948265-20867-1-git-send-email-jsynacek@redhat.com> References: <1358948265-20867-1-git-send-email-jsynacek@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Signed-off-by: Jan Synacek --- ninfod/ninfod.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ninfod/ninfod.c b/ninfod/ninfod.c index d1b99d9..58b15aa 100644 --- a/ninfod/ninfod.c +++ b/ninfod/ninfod.c @@ -637,16 +637,8 @@ int main (int argc, char **argv) appname = argv[0]; - limit_capabilities(); - - sock = open_sock(); - if (sock < 0) - sock_errno = errno; - parse_args(argc, argv); - drop_capabilities(); - if (opt_h || opt_v) print_copying(); if (opt_h) { @@ -654,6 +646,14 @@ int main (int argc, char **argv) exit(1); } + limit_capabilities(); + + sock = open_sock(); + if (sock < 0) + sock_errno = errno; + + drop_capabilities(); + if (sock_errno) { DEBUG(LOG_ERR, "socket: %s\n", strerror(sock_errno)); exit(1);