remove HAVE_HURD_OS

bareos · May 30, 2023 · 5c9b872 · 5c9b872
1 parent 0fd4cb4
commit 5c9b872
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 27 deletions.
diff --git a/core/src/findlib/acl.cc b/core/src/findlib/acl.cc
@@ -526,7 +526,7 @@ static bacl_exit_code (*os_parse_acl_streams)(JobControlRecord* jcr,
     = aix_parse_acl_streams;
 
 #    elif defined(HAVE_DARWIN_OS) || defined(HAVE_FREEBSD_OS) \
-        || defined(HAVE_LINUX_OS) || defined(HAVE_HURD_OS)
+        || defined(HAVE_LINUX_OS)
 
 #      include <sys/types.h>
 
@@ -607,8 +607,7 @@ static acl_type_t BacToOsAcltype(bacl_type acltype)
 static int AclCountEntries(acl_t acl)
 {
   int count = 0;
-#      if defined(HAVE_FREEBSD_OS) || defined(HAVE_LINUX_OS) \
-          || defined(HAVE_HURD_OS)
+#      if defined(HAVE_FREEBSD_OS) || defined(HAVE_LINUX_OS)
   acl_entry_t ace;
   int entry_available;
 
@@ -645,8 +644,7 @@ static bool AclIsTrivial(acl_t acl)
    */
   acl_entry_t ace;
   acl_tag_t tag;
-#        if defined(HAVE_FREEBSD_OS) || defined(HAVE_LINUX_OS) \
-            || defined(HAVE_HURD_OS)
+#        if defined(HAVE_FREEBSD_OS) || defined(HAVE_LINUX_OS)
   int entry_available;
 
   entry_available = acl_get_entry(acl, ACL_FIRST_ENTRY, &ace);
@@ -1178,15 +1176,10 @@ static bacl_exit_code (*os_parse_acl_streams)(JobControlRecord* jcr,
                                               uint32_t content_length)
     = freebsd_parse_acl_streams;
 
-#      elif defined(HAVE_LINUX_OS) || defined(HAVE_HURD_OS)
-// Define the supported ACL streams for these OSes
-#        if defined(HAVE_LINUX_OS)
+#      elif defined(HAVE_LINUX_OS)
+// Define the supported ACL streams
 static int os_access_acl_streams[1] = {STREAM_ACL_LINUX_ACCESS_ACL};
 static int os_default_acl_streams[1] = {STREAM_ACL_LINUX_DEFAULT_ACL};
-#        elif defined(HAVE_HURD_OS)
-static int os_access_acl_streams[1] = {STREAM_ACL_HURD_ACCESS_ACL};
-static int os_default_acl_streams[1] = {STREAM_ACL_HURD_DEFAULT_ACL};
-#        endif
 
 static bacl_exit_code generic_build_acl_streams(JobControlRecord* jcr,
                                                 AclData* acl_data,

diff --git a/core/src/findlib/xattr.cc b/core/src/findlib/xattr.cc
@@ -623,8 +623,7 @@ static BxattrExitCode (*os_parse_xattr_streams)(JobControlRecord* jcr,
                                                 uint32_t content_length)
     = aix_parse_xattr_streams;
 
-#  elif defined(HAVE_DARWIN_OS) || defined(HAVE_LINUX_OS) \
-      || defined(HAVE_HURD_OS)
+#  elif defined(HAVE_DARWIN_OS) || defined(HAVE_LINUX_OS)
 
 #    if (!defined(HAVE_LISTXATTR) && !defined(HAVE_LLISTXATTR))  \
         || (!defined(HAVE_GETXATTR) && !defined(HAVE_LGETXATTR)) \
@@ -652,10 +651,6 @@ static const char* xattr_skiplist[]
     = {"ceph.dir.entries",  "ceph.dir.files",    "ceph.dir.rbytes",
        "ceph.dir.rctime",   "ceph.dir.rentries", "ceph.dir.rfiles",
        "ceph.dir.rsubdirs", "ceph.dir.subdirs",  NULL};
-#    elif defined(HAVE_HURD_OS)
-static int os_default_xattr_streams[1] = {STREAM_XATTR_HURD};
-static const char* xattr_acl_skiplist[1] = {NULL};
-static const char* xattr_skiplist[1] = {NULL};
 #    endif
 
 /**

diff --git a/core/src/findlib/xattr.h b/core/src/findlib/xattr.h
@@ -37,8 +37,6 @@ enum class BxattrExitCode
 #  define BXATTR_ENOTSUP EOPNOTSUPP
 #elif defined(HAVE_DARWIN_OS)
 #  define BXATTR_ENOTSUP ENOTSUP
-#elif defined(HAVE_HURD_OS)
-#  define BXATTR_ENOTSUP ENOTSUP
 #endif
 
 /*

diff --git a/core/src/include/config.h.in b/core/src/include/config.h.in
@@ -244,9 +244,6 @@ extern char win_os[];
 // Define to 1 if you have the <grp.h> header file
 #cmakedefine HAVE_GRP_H @HAVE_GRP_H@
 
-// Define to 1 if you are running GNU Hurd
-#cmakedefine HAVE_HURD_OS @HAVE_HURD_OS@
-
 // Define to 1 if you have the `inet_ntop' function
 #cmakedefine HAVE_INET_NTOP @HAVE_INET_NTOP@
 

diff --git a/core/src/lib/mntent_cache.cc b/core/src/lib/mntent_cache.cc
@@ -69,9 +69,6 @@
 #    include <mntent.h>
 #  elif defined(HAVE_SUN_OS)
 #    include <sys/mnttab.h>
-#  elif defined(HAVE_HURD_OS)
-#    include <hurd/paths.h>
-#    include <mntent.h>
 #  endif /* HAVE_GETMNTENT */
 #elif defined(HAVE_GETMNTINFO)
 #  if defined(HAVE_OPENBSD_OS)
@@ -230,7 +227,7 @@ static void refresh_mount_cache([[maybe_unused]] mntent_cache_entry_t*
 #if defined(HAVE_GETMNTENT)
   FILE* fp;
   struct stat st;
-#  if defined(HAVE_LINUX_OS) || defined(HAVE_AIX_OS) || defined(HAVE_HURD_OS)
+#  if defined(HAVE_LINUX_OS) || defined(HAVE_AIX_OS)
   struct mntent* mnt;
 
 #    if defined(HAVE_LINUX_OS)