I can't see the screen with my sunglasses on

[citadel.git] / citadel / utils / ctdlmigrate.c

diff --git a/citadel/utils/ctdlmigrate.c b/citadel/utils/ctdlmigrate.c
index 5d86011797e8dbdee25896c0b68be0126642e72f..19539ba37d13b2c46b6ed5eafa3bf626595f6142 100644 (file)
--- a/citadel/utils/ctdlmigrate.c
+++ b/citadel/utils/ctdlmigrate.c
@@ -1,14 +1,9 @@
 // Across-the-wire migration utility for Citadel
 //
-// Copyright (c) 2009-2021 citadel.org
+// Copyright (c) 2009-2022 citadel.org
 //
-// This program is open source software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License version 3.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// This program is open source software.  Use, duplication, or disclosure
+// is subject to the terms of the GNU General Public License, version 3.
 
 #include <stdlib.h>
 #include <unistd.h>
@@ -30,11 +25,11 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include <libcitadel.h>
-#include "citadel.h"
+#include "../server/citadel.h"
 #include "axdefs.h"
-#include "sysdep.h"
-#include "config.h"
-#include "citadel_dirs.h"
+#include "../server/sysdep.h"
+#include "../server/config.h"
+#include "../server/citadel_dirs.h"
 
 
 // support for getz() -- (globals would not be appropriate in a multithreaded program)
@@ -105,7 +100,8 @@ static int tcp_connectsock(char *host, char *service) {
        if (rc == 1) {                                  // dotted quad
                hints.ai_family = AF_INET;
                hints.ai_flags |= AI_NUMERICHOST;
-       } else {
+       }
+       else {
                rc = inet_pton(AF_INET6, host, &serveraddr);
                if (rc == 1) {                          // IPv6 address
                        hints.ai_family = AF_INET6;