diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2015-09-11 19:03:32 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2015-09-11 19:03:32 +0000 |
| commit | 52e597cf0b5612da05291c9fb10d4bc8699a88d6 (patch) | |
| tree | 5541d29044c756ad6c73f9427c6ffbd584639fe9 /usr.sbin | |
| parent | ebe7e92c35931b08cffde71da246f5a209ab9e60 (diff) | |
Since immediate_abort is modified by a signal handler it must be
volatile sig_atomic_t.
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/amd/amd/amd.c | 4 | ||||
| -rw-r--r-- | usr.sbin/amd/include/am.h | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/usr.sbin/amd/amd/amd.c b/usr.sbin/amd/amd/amd.c index 4bcf665dd58..3f46c4e82df 100644 --- a/usr.sbin/amd/amd/amd.c +++ b/usr.sbin/amd/amd/amd.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#)amd.c 8.1 (Berkeley) 6/6/93 - * $Id: amd.c,v 1.21 2014/10/26 02:43:50 guenther Exp $ + * $Id: amd.c,v 1.22 2015/09/11 19:03:30 millert Exp $ */ /* @@ -76,7 +76,7 @@ char *endian = ARCH_ENDIAN; /* Big or Little endian */ char *wire; int foreground = 1; /* This is the top-level server */ pid_t mypid; /* Current process id */ -int immediate_abort; /* Should close-down unmounts be retried */ +volatile sig_atomic_t immediate_abort; /* Should close-down unmounts be retried */ struct in_addr myipaddr; /* (An) IP address of this host */ serv_state amd_state; struct amd_stats amd_stats; /* Server statistics */ diff --git a/usr.sbin/amd/include/am.h b/usr.sbin/amd/include/am.h index da0aaa5df3a..1f4da931405 100644 --- a/usr.sbin/amd/include/am.h +++ b/usr.sbin/amd/include/am.h @@ -1,4 +1,4 @@ -/* $OpenBSD: am.h,v 1.18 2015/03/14 23:02:21 millert Exp $ */ +/* $OpenBSD: am.h,v 1.19 2015/09/11 19:03:31 millert Exp $ */ /* * Copyright (c) 1990 Jan-Simon Pendry @@ -85,7 +85,8 @@ typedef enum { } serv_state; extern serv_state amd_state; /* Should we go now */ -extern int immediate_abort; /* Should close-down unmounts be retried */ +extern volatile sig_atomic_t immediate_abort; + /* Should close-down unmounts be retried */ extern time_t do_mapc_reload; /* Flush & reload mount map cache */ /* |