summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am3
-rw-r--r--configure.ac20
-rw-r--r--factory/etc/nsswitch.conf6
3 files changed, 1 insertions, 28 deletions
diff --git a/Makefile.am b/Makefile.am
index 1356ae2e32..3025c65ad2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -646,8 +646,7 @@ src/shared/cap-from-name.h: src/shared/cap-from-name.gperf
$(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_capability -H hash_capability_name -p -C <$< >$@
# ------------------------------------------------------------------------------
-dist_factory_etc_DATA = \
- factory/etc/nsswitch.conf
+dist_factory_etc_DATA =
if HAVE_PAM
dist_factory_pam_DATA = \
diff --git a/configure.ac b/configure.ac
index 0117573b3f..568d56c95f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -528,25 +528,6 @@ AM_CONDITIONAL(ENABLE_KDBUS, [test "$have_kdbus" = "yes"])
AC_CHECK_HEADERS_ONCE([valgrind/memcheck.h valgrind/valgrind.h])
# ------------------------------------------------------------------------------
-have_myhostname=no
-AC_ARG_ENABLE(myhostname, AS_HELP_STRING([--disable-myhostname], [disable nss-myhostname support]))
-if test "x$enable_myhostname" != "xno"; then
- AC_HEADER_STDC
- AC_CHECK_HEADERS([arpa/inet.h fcntl.h inttypes.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h unistd.h nss.h sys/ioctl.h sys/auxv.h])
-
- AC_C_CONST
- AC_TYPE_SIZE_T
- AC_HEADER_TIME
-
- AC_FUNC_MALLOC
- AC_FUNC_SELECT_ARGTYPES
- AC_CHECK_FUNCS([gethostbyaddr gethostbyname gettimeofday inet_ntoa memset select socket strcspn strdup strerror strncasecmp strcasecmp strspn])
-
- have_myhostname=yes
-fi
-AM_CONDITIONAL(HAVE_MYHOSTNAME, [test "$have_myhostname" = "yes"])
-
-# ------------------------------------------------------------------------------
AC_ARG_ENABLE([gudev],
AS_HELP_STRING([--disable-gudev], [disable Gobject libudev support @<:@default=enabled@:>@]),
[], [enable_gudev=yes])
@@ -733,7 +714,6 @@ AC_MSG_RESULT([
polkit: ${have_polkit}
blkid: ${have_blkid}
dbus: ${have_dbus}
- nss-myhostname: ${have_myhostname}
gudev: ${enable_gudev}
hwdb: ${enable_hwdb}
kdbus: ${have_kdbus}
diff --git a/factory/etc/nsswitch.conf b/factory/etc/nsswitch.conf
deleted file mode 100644
index 5f2984e77f..0000000000
--- a/factory/etc/nsswitch.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# This file is part of systemd.
-
-passwd: files
-shadow: files
-group: files
-hosts: files mymachines resolve myhostname