meson: Check for SunRPC function quota_open(), GitHub #1225

Netatalk · Nov 22, 2024 · cb02a80 · cb02a80
1 parent c6b7293
commit cb02a80
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/etc/afpd/meson.build b/etc/afpd/meson.build
@@ -73,9 +73,13 @@ endif
 
 if have_quota
     afpd_sources += [
-        'nfsquota.c',
         'quota.c',
     ]
+    if host_os != 'netbsd'
+        afpd_sources += [
+            'nfsquota.c',
+        ]
+    endif
     afpd_external_deps += quota_deps
 endif
 

diff --git a/etc/afpd/quota.c b/etc/afpd/quota.c
@@ -32,6 +32,7 @@
 #include <atalk/util.h>
 
 #include "auth.h"
+#include "directory.h"
 #include "volume.h"
 #include "unix.h"
 
@@ -649,8 +650,10 @@ static int getquota(const AFPObj *obj, struct vol *vol, struct dqblk *dq, const
     }
 #endif
 
+#if !defined(__NetBSD__)
     return vol->v_nfs ? getnfsquota(vol, obj->uid, bsize, dq) :
       getfsquota(obj, vol, obj->uid, dq);
+#endif
 }
 
 static int overquota( struct dqblk *dqblk)

diff --git a/meson.build b/meson.build
@@ -1017,7 +1017,7 @@ else
         if have_quota
             quota_deps += rpcsvc
             quota_provider += 'SunRPC'
-            if quota.found() and cc.has_function('getfsquota', dependencies: [quota, prop, rpcsvc])
+            if quota.found() and cc.has_function('quota_open', dependencies: [quota, prop, rpcsvc])
                 quota_deps += [quota, prop]
                 cdata.set('HAVE_LIBQUOTA', 1)
             endif

diff --git a/test/afpd/meson.build b/test/afpd/meson.build
@@ -56,9 +56,13 @@ endif
 
 if have_quota
     test_sources += [
-        meson.project_source_root() / 'etc/afpd/nfsquota.c',
         meson.project_source_root() / 'etc/afpd/quota.c',
     ]
+    if host_os != 'netbsd'
+        test_sources += [
+            meson.project_source_root() / 'etc/afpd/nfsquota.c',
+        ]
+    endif
     test_external_deps += quota_deps
 endif