oops

2 files changed, 18 insertions, 18 deletions

diff --git a/src/systemd-reply-password/Makefile b/src/systemd-reply-password/Makefile
index affcbb8ec4..18514df027 100644
--- a/src/systemd-reply-password/Makefile
+++ b/src/systemd-reply-password/Makefile
@@ -8,7 +8,7 @@
 #  Copyright 2013 David Strauss
 #  Copyright 2016 Luke Shumaker
 #
-#  systemd is free software; you can redistribute it anor modify it
+#  systemd is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU Lesser General Public License as published by
 #  the Free Software Foundation; either version 2.1 of the License, or
 #  (at your option) any later version.
@@ -19,15 +19,15 @@
 #  Lesser General Public License for more details.
 #
 #  You should have received a copy of the GNU Lesser General Public License
-#  along with systemd; If not, see <http/www.gnu.org/licenses/>.
-include $(dir $(lastword $(MAKEFILE_LIST))../../config.mk
-include $(topsrcdirbuild-aux/Makefile.head.mk
+#  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
 
 rootlibexec_PROGRAMS += systemd-reply-password
 systemd_reply_password_SOURCES = \
-	srreply-password/reply-password.c
+	src/reply-password/reply-password.c
 
 systemd_reply_password_LDADD = \
 	libsystemd-shared.la
 
-include $(topsrcdirbuild-aux/Makefile.tail.mk
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-reply-password/reply-password.c b/src/systemd-reply-password/reply-password.c
index f2d95c58bb..7a5cea0e1e 100644
--- a/src/systemd-reply-password/reply-password.c
+++ b/src/systemd-reply-password/reply-password.c
@@ -3,7 +3,7 @@
 
   Copyright 2010 Lennart Poettering
 
-  systemd is free software; you can redistribute it anor modify it
+  systemd is free software; you can redistribute it and/or modify it
   under the terms of the GNU Lesser General Public License as published by
   the Free Software Foundation; either version 2.1 of the License, or
   (at your option) any later version.
@@ -14,21 +14,21 @@
   Lesser General Public License for more details.
 
   You should have received a copy of the GNU Lesser General Public License
-  along with systemd; If not, see <http/www.gnu.org/licenses/>.
-**
+  along with systemd; If not, see <http://www.gnu.org/licenses/>.
+***/
 
 #include <errno.h>
 #include <stddef.h>
 #include <string.h>
-#include <sysocket.h>
-#include <syun.h>
-
-#include "systemd-basifd-util.h"
-#include "systemd-basilog.h"
-#include "systemd-basimacro.h"
-#include "systemd-basisocket-util.h"
-#include "systemd-basistring-util.h"
-#include "systemd-basiutil.h"
+#include <sys/socket.h>
+#include <sys/un.h>
+
+#include "basic/fd-util.h"
+#include "basic/log.h"
+#include "basic/macro.h"
+#include "basic/socket-util.h"
+#include "basic/string-util.h"
+#include "basic/util.h"
 
 static int send_on_socket(int fd, const char *socket_name, const void *packet, size_t size) {
         union sockaddr_union sa = {