From patchwork Wed Jun 1 03:48:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 628460 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 3rKGYP5qSLz9t5X for ; Wed, 1 Jun 2016 13:48:41 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757219AbcFADsh (ORCPT ); Tue, 31 May 2016 23:48:37 -0400 Received: from smtp.gentoo.org ([140.211.166.183]:58834 "EHLO smtp.gentoo.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755697AbcFADsb (ORCPT ); Tue, 31 May 2016 23:48:31 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 35CB9340C42; Wed, 1 Jun 2016 03:48:30 +0000 (UTC) From: Mike Frysinger To: YOSHIFUJI Hideaki Cc: netdev@vger.kernel.org Subject: [PATCH iputils 5/6] tftpd: fix syslog setup Date: Tue, 31 May 2016 23:48:24 -0400 Message-Id: <1464752905-10347-5-git-send-email-vapier@gentoo.org> X-Mailer: git-send-email 2.8.2 In-Reply-To: <1464752905-10347-1-git-send-email-vapier@gentoo.org> References: <1464752905-10347-1-git-send-email-vapier@gentoo.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Commit d81a44625b04d487c895473aa77af13420b7afdd added support for checking the set*id calls, but would call syslog() before it had called openlog(). Move the call up earlier to fix that. Signed-off-by: Mike Frysinger --- tftpd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tftpd.c b/tftpd.c index e3af2f4..7ddc8eb 100644 --- a/tftpd.c +++ b/tftpd.c @@ -109,6 +109,8 @@ int main(int ac, char **av) register int n = 0; int on = 1; + openlog("tftpd", LOG_PID, LOG_DAEMON); + /* Sanity. If parent forgot to setuid() on us. */ if (geteuid() == 0) { if (setgid(65534)) { @@ -125,7 +127,6 @@ int main(int ac, char **av) while (ac-- > 0 && n < MAXARG) dirs[n++] = *av++; - openlog("tftpd", LOG_PID, LOG_DAEMON); if (ioctl(0, FIONBIO, &on) < 0) { syslog(LOG_ERR, "ioctl(FIONBIO): %m\n"); exit(1);