Skip to content

Commit

Permalink
auth: merge "main" code into new auth-main.(cc|hh)
Browse files Browse the repository at this point in the history
Merge common_startup.cc and receiver.cc into auth-main.cc, and
rename common_startup.hh into receiver.hh.
This is a very minimal merge with no cleanup. Its intention is to
make understanding the startup code path easier, by avoiding having
to look at two compilation units to determine the exact order.
  • Loading branch information
zeha committed Aug 2, 2022
1 parent fbd29da commit 8cb70f2
Show file tree
Hide file tree
Showing 14 changed files with 669 additions and 720 deletions.
3 changes: 0 additions & 3 deletions .not-formatted
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@
./pdns/cdb.hh
./pdns/comfun.cc
./pdns/comment.hh
./pdns/common_startup.cc
./pdns/common_startup.hh
./pdns/communicator.cc
./pdns/communicator.hh
./pdns/dbdnsseckeeper.cc
Expand Down Expand Up @@ -237,7 +235,6 @@
./pdns/query-local-address.hh
./pdns/rcpgenerator.cc
./pdns/rcpgenerator.hh
./pdns/receiver.cc
./pdns/remote_logger.cc
./pdns/remote_logger.hh
./pdns/resolve-context.hh
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ AC_INIT([pdns], m4_esyscmd([builder-support/gen-version]))
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip tar-ustar -Wno-portability subdir-objects parallel-tests 1.11])
AM_SILENT_RULES([yes])
AC_CONFIG_SRCDIR([pdns/receiver.cc])
AC_CONFIG_SRCDIR([pdns/auth-main.cc])
AC_CONFIG_MACRO_DIR([m4])

AC_USE_SYSTEM_EXTENSIONS
Expand Down
3 changes: 1 addition & 2 deletions pdns/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ pdns_server_SOURCES = \
auth-caches.cc auth-caches.hh \
auth-carbon.cc \
auth-catalogzone.cc auth-catalogzone.hh \
auth-main.cc auth-main.hh \
auth-packetcache.cc auth-packetcache.hh \
auth-querycache.cc auth-querycache.hh \
auth-zonecache.cc auth-zonecache.hh \
Expand All @@ -204,7 +205,6 @@ pdns_server_SOURCES = \
cachecleaner.hh \
circular_buffer.hh \
comment.hh \
common_startup.cc common_startup.hh \
communicator.cc communicator.hh \
credentials.cc credentials.hh \
dbdnsseckeeper.cc \
Expand Down Expand Up @@ -252,7 +252,6 @@ pdns_server_SOURCES = \
qtype.cc qtype.hh \
query-local-address.hh query-local-address.cc \
rcpgenerator.cc \
receiver.cc \
resolver.cc resolver.hh \
responsestats.cc responsestats.hh responsestats-auth.cc \
rfc2136handler.cc \
Expand Down
2 changes: 1 addition & 1 deletion pdns/auth-carbon.cc
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include "iputils.hh"
#include "sstuff.hh"
#include "arguments.hh"
#include "common_startup.hh"
#include "auth-main.hh"

#include "namespaces.hh"

Expand Down
Loading

0 comments on commit 8cb70f2

Please sign in to comment.