Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
BIND
Commits
3178974f
Commit
3178974f
authored
Mar 09, 2020
by
Ondřej Surý
Browse files
Use the new sorting rules to regroup #include headers
parent
5071c47f
Pipeline
#36109
passed with stages
in 22 minutes and 39 seconds
Changes
129
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
bin/check/named-checkconf.c
View file @
3178974f
...
...
@@ -38,10 +38,10 @@
#include <isccfg/grammar.h>
#include <isccfg/namedconf.h>
#include "check-tool.h"
#include <bind9/check.h>
#include "check-tool.h"
static
const
char
*
program
=
"named-checkconf"
;
static
bool
loadplugins
=
true
;
...
...
bin/confgen/ddns-confgen.c
View file @
3178974f
...
...
@@ -42,11 +42,12 @@
#include <dns/name.h>
#include <dns/result.h>
#include "keygen.h"
#include "util.h"
#include <dst/dst.h>
#include <confgen/os.h>
#include <dst/dst.h>
#include "keygen.h"
#include "util.h"
#define KEYGEN_DEFAULT "tsig-key"
#define CONFGEN_DEFAULT "ddns-key"
...
...
bin/confgen/keygen.c
View file @
3178974f
...
...
@@ -12,7 +12,6 @@
/*! \file */
#include "keygen.h"
#include <stdarg.h>
#include <stdlib.h>
...
...
@@ -24,14 +23,16 @@
#include <isc/result.h>
#include <isc/string.h>
#include <pk11/site.h>
#include <dns/keyvalues.h>
#include <dns/name.h>
#include
"util
.h
"
#include
<dst/dst
.h
>
#include <confgen/os.h>
#include <dst/dst.h>
#include
<pk11/site
.h
>
#include
"util
.h
"
/*%
* Convert algorithm type to string.
...
...
bin/confgen/rndc-confgen.c
View file @
3178974f
...
...
@@ -37,15 +37,17 @@
#include <isc/time.h>
#include <isc/util.h>
#include <pk11/site.h>
#include <dns/keyvalues.h>
#include <dns/name.h>
#include "keygen.h"
#include "util.h"
#include <dst/dst.h>
#include <confgen/os.h>
#include <dst/dst.h>
#include <pk11/site.h>
#include "keygen.h"
#include "util.h"
#define DEFAULT_KEYNAME "rndc-key"
#define DEFAULT_SERVER "127.0.0.1"
...
...
bin/confgen/unix/os.c
View file @
3178974f
...
...
@@ -15,11 +15,11 @@
#include <fcntl.h>
#include <pwd.h>
#include <stdio.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
#include <confgen/os.h>
#include <sys/stat.h>
#include <sys/types.h>
int
set_user
(
FILE
*
fd
,
const
char
*
user
)
{
...
...
bin/confgen/util.c
View file @
3178974f
...
...
@@ -12,7 +12,6 @@
/*! \file */
#include "util.h"
#include <stdarg.h>
#include <stdbool.h>
#include <stdio.h>
...
...
bin/confgen/win32/os.c
View file @
3178974f
...
...
@@ -13,11 +13,11 @@
#include <fcntl.h>
#include <io.h>
#include <stdio.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
#include <confgen/os.h>
#include <sys/stat.h>
#include <sys/types.h>
int
set_user
(
FILE
*
fd
,
const
char
*
user
)
{
...
...
bin/delv/delv.c
View file @
3178974f
...
...
@@ -12,11 +12,10 @@
#include <bind.keys.h>
#ifndef WIN32
#include <netdb.h>
#include <signal.h>
#include <arpa/inet.h>
#include <netdb.h>
#include <netinet/in.h>
#include <signal.h>
#include <sys/socket.h>
#include <sys/types.h>
#endif
/* ifndef WIN32 */
...
...
@@ -66,11 +65,12 @@
#include <dns/secalg.h>
#include <dns/view.h>
#include <dst/dst.h>
#include <dst/result.h>
#include <isccfg/log.h>
#include <isccfg/namedconf.h>
#include <dst/dst.h>
#include <dst/result.h>
#include <irs/netdb.h>
#include <irs/resconf.h>
...
...
bin/dig/dig.c
View file @
3178974f
...
...
@@ -26,6 +26,8 @@
#include <isc/task.h>
#include <isc/util.h>
#include <pk11/site.h>
#include <dns/byaddr.h>
#include <dns/fixedname.h>
#include <dns/masterdump.h>
...
...
@@ -40,7 +42,6 @@
#include <dns/tsig.h>
#include <dig/dig.h>
#include <pk11/site.h>
#define ADD_STRING(b, s) \
{ \
...
...
bin/dig/dighost.c
View file @
3178974f
...
...
@@ -57,6 +57,8 @@
#include <isc/types.h>
#include <isc/util.h>
#include <pk11/site.h>
#include <dns/byaddr.h>
#include <dns/fixedname.h>
#include <dns/log.h>
...
...
@@ -72,14 +74,16 @@
#include <dns/result.h>
#include <dns/tsig.h>
#include <dst/dst.h>
#include <dst/result.h>
#include <isccfg/namedconf.h>
#include <irs/resconf.h>
#include <bind9/getaddresses.h>
#include <dig/dig.h>
#include <dst/dst.h>
#include <dst/result.h>
#include <irs/resconf.h>
#include <pk11/site.h>
#if USE_PKCS11
#include <pk11/result.h>
...
...
bin/dnssec/dnssec-keyfromlabel.c
View file @
3178974f
...
...
@@ -24,6 +24,8 @@
#include <isc/string.h>
#include <isc/util.h>
#include <pk11/site.h>
#include <dns/dnssec.h>
#include <dns/fixedname.h>
#include <dns/keyvalues.h>
...
...
@@ -34,7 +36,6 @@
#include <dns/secalg.h>
#include <dst/dst.h>
#include <pk11/site.h>
#if USE_PKCS11
#include <pk11/result.h>
...
...
bin/dnssec/dnssec-keygen.c
View file @
3178974f
...
...
@@ -39,6 +39,8 @@
#include <isc/string.h>
#include <isc/util.h>
#include <pk11/site.h>
#include <dns/dnssec.h>
#include <dns/fixedname.h>
#include <dns/kasp.h>
...
...
@@ -49,14 +51,13 @@
#include <dns/result.h>
#include <dns/secalg.h>
#include <dst/dst.h>
#include <isccfg/cfg.h>
#include <isccfg/grammar.h>
#include <isccfg/kaspconf.h>
#include <isccfg/namedconf.h>
#include <dst/dst.h>
#include <pk11/site.h>
#if USE_PKCS11
#include <pk11/result.h>
#endif
/* if USE_PKCS11 */
...
...
bin/named/config.c
View file @
3178974f
...
...
@@ -25,6 +25,8 @@
#include <isc/string.h>
#include <isc/util.h>
#include <pk11/site.h>
#include <dns/fixedname.h>
#include <dns/name.h>
#include <dns/rdataclass.h>
...
...
@@ -32,13 +34,13 @@
#include <dns/tsig.h>
#include <dns/zone.h>
#include <dst/dst.h>
#include <isccfg/grammar.h>
#include <isccfg/namedconf.h>
#include <dst/dst.h>
#include <named/config.h>
#include <named/globals.h>
#include <pk11/site.h>
/*% default configuration */
static
char
defaultconf
[]
=
"\
...
...
bin/named/control.c
View file @
3178974f
...
...
@@ -26,6 +26,7 @@
#include <isccc/alist.h>
#include <isccc/cc.h>
#include <isccc/result.h>
#include <named/control.h>
#include <named/globals.h>
#include <named/log.h>
...
...
bin/named/controlconf.c
View file @
3178974f
...
...
@@ -31,9 +31,6 @@
#include <dns/result.h>
#include <isccfg/namedconf.h>
#include <bind9/check.h>
#include <isccc/alist.h>
#include <isccc/cc.h>
#include <isccc/ccmsg.h>
...
...
@@ -42,6 +39,11 @@
#include <isccc/sexpr.h>
#include <isccc/symtab.h>
#include <isccc/util.h>
#include <isccfg/namedconf.h>
#include <bind9/check.h>
#include <named/config.h>
#include <named/control.h>
#include <named/log.h>
...
...
bin/named/fuzz.c
View file @
3178974f
...
...
@@ -15,6 +15,7 @@
#include <named/fuzz.h>
#ifdef ENABLE_AFL
#include <arpa/inet.h>
#include <errno.h>
#include <pthread.h>
#include <signal.h>
...
...
@@ -30,7 +31,6 @@
#include <dns/log.h>
#include <arpa/inet.h>
#include <named/globals.h>
#include <named/log.h>
#include <named/server.h>
...
...
bin/named/main.c
View file @
3178974f
...
...
@@ -44,6 +44,7 @@
#include <dns/view.h>
#include <dst/result.h>
#include <isccc/result.h>
#if USE_PKCS11
#include <pk11/result.h>
...
...
bin/named/server.c
View file @
3178974f
...
...
@@ -16,6 +16,8 @@
#include <limits.h>
#include <stdbool.h>
#include <stdlib.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
#include <isc/aes.h>
...
...
@@ -91,6 +93,9 @@
#include <dns/zone.h>
#include <dns/zt.h>
#include <dst/dst.h>
#include <dst/result.h>
#include <isccfg/grammar.h>
#include <isccfg/kaspconf.h>
#include <isccfg/namedconf.h>
...
...
@@ -101,12 +106,9 @@
#include <ns/listenlist.h>
#include <bind9/check.h>
#include <dst/dst.h>
#include <dst/result.h>
#include <named/config.h>
#include <named/control.h>
#include <sys/stat.h>
#include <sys/types.h>
#if defined(HAVE_GEOIP2)
#include <named/geoip.h>
#endif
/* HAVE_GEOIP2 */
...
...
bin/named/statschannel.c
View file @
3178974f
...
...
@@ -43,9 +43,8 @@
#include <named/statschannel.h>
#if HAVE_JSON_C
#include <linkhash.h>
#include <json_object.h>
#include <linkhash.h>
#endif
/* HAVE_JSON_C */
#if HAVE_LIBXML2
...
...
bin/named/tkeyconf.c
View file @
3178974f
...
...
@@ -22,9 +22,10 @@
#include <dns/name.h>
#include <dns/tkey.h>
#include <dst/gssapi.h>
#include <isccfg/cfg.h>
#include <dst/gssapi.h>
#include <named/tkeyconf.h>
#define RETERR(x) \
...
...
Prev
1
2
3
4
5
…
7
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment