Browse Source

some fatal() calls that should be fatalx(); ok henning@

OPENBSD_4_3
stevesk 17 years ago
parent
commit
14460a3689
2 changed files with 4 additions and 4 deletions
  1. +2
    -2
      src/usr.sbin/ntpd/client.c
  2. +2
    -2
      src/usr.sbin/ntpd/ntp.c

+ 2
- 2
src/usr.sbin/ntpd/client.c View File

@ -1,4 +1,4 @@
/* $OpenBSD: client.c,v 1.77 2007/11/22 10:24:25 otto Exp $ */
/* $OpenBSD: client.c,v 1.78 2007/12/27 01:46:50 stevesk Exp $ */
/* /*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@ -80,7 +80,7 @@ client_addr_init(struct ntp_peer *p)
p->state = STATE_DNS_DONE; p->state = STATE_DNS_DONE;
break; break;
default: default:
fatal("king bula sez: wrong AF in client_addr_init");
fatalx("king bula sez: wrong AF in client_addr_init");
/* not reached */ /* not reached */
} }
} }


+ 2
- 2
src/usr.sbin/ntpd/ntp.c View File

@ -1,4 +1,4 @@
/* $OpenBSD: ntp.c,v 1.101 2007/12/22 18:26:21 stevesk Exp $ */
/* $OpenBSD: ntp.c,v 1.102 2007/12/27 01:46:50 stevesk Exp $ */
/* /*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@ -110,7 +110,7 @@ ntp_main(int pipe_prnt[2], struct ntpd_conf *nconf, struct passwd *pw)
if (stat(pw->pw_dir, &stb) == -1) if (stat(pw->pw_dir, &stb) == -1)
fatal("stat"); fatal("stat");
if (stb.st_uid != 0 || (stb.st_mode & (S_IWGRP|S_IWOTH)) != 0) if (stb.st_uid != 0 || (stb.st_mode & (S_IWGRP|S_IWOTH)) != 0)
fatal("bad privsep dir permissions");
fatalx("bad privsep dir permissions");
if (chroot(pw->pw_dir) == -1) if (chroot(pw->pw_dir) == -1)
fatal("chroot"); fatal("chroot");
if (chdir("/") == -1) if (chdir("/") == -1)


Loading…
Cancel
Save