diff options
| author |   mortimer <mortimer@openbsd.org> | 2020-09-06 17:08:29 +0000 |
|---|---|---|
| committer | mortimer <mortimer@openbsd.org> | 2020-09-06 17:08:29 +0000 |
| commit | a7b56afa0e2c1bb64f89dcd77df11cba33516425 (patch) | |
| tree | 2b76dbda2622bc3535f464ddc2f8a7b0e974ab96 /libexec | |
| parent | replace duplicated sizeofa marco with predefined nitems (diff) | |
| download | wireguard-openbsd-a7b56afa0e2c1bb64f89dcd77df11cba33516425.tar.xz wireguard-openbsd-a7b56afa0e2c1bb64f89dcd77df11cba33516425.zip | |
Move definiton of struct token_types *tt to init.c from header file.
Makes it build with -fno-common.
ok deraadt
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/login_token/init.c | 4 | ||||
| -rw-r--r-- | libexec/login_token/token.h | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/libexec/login_token/init.c b/libexec/login_token/init.c index 0b3ab9b8d37..559171189af 100644 --- a/libexec/login_token/init.c +++ b/libexec/login_token/init.c @@ -1,4 +1,4 @@ -/* $OpenBSD: init.c,v 1.5 2013/12/03 01:29:00 deraadt Exp $ */ +/* $OpenBSD: init.c,v 1.6 2020/09/06 17:08:29 mortimer Exp $ */ /*- * Copyright (c) 1996 Berkeley Software Design, Inc. All rights reserved. @@ -62,6 +62,8 @@ static struct token_types types[] = { TOKEN_HEXMODE }, /* default */ }; +struct token_types *tt; + static struct { char *name; u_int value; diff --git a/libexec/login_token/token.h b/libexec/login_token/token.h index ae17e00ae43..d666558ca37 100644 --- a/libexec/login_token/token.h +++ b/libexec/login_token/token.h @@ -1,4 +1,4 @@ -/* $OpenBSD: token.h,v 1.4 2002/09/06 18:19:14 deraadt Exp $ */ +/* $OpenBSD: token.h,v 1.5 2020/09/06 17:08:29 mortimer Exp $ */ /*- * Copyright (c) 1995 Migration Associates Corp. All Rights Reserved @@ -64,7 +64,7 @@ struct token_types { u_int defmode; /* default mode (if none specified) */ }; -struct token_types *tt; /* what type we are running as now */ +extern struct token_types *tt; /* what type we are running as now */ /* * Options |