Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

meson: Fix issues with quota support on linux and macOS hosts #1092

Merged
merged 3 commits into from
Jun 14, 2024

Conversation

dgsga
Copy link
Contributor

@dgsga dgsga commented Jun 14, 2024

This changeset:

  • Fixes quota support on macOS hosts
  • Restores missing configuration option for linux hosts (taken from autotools netatalk.m4 macro)
  • Removes obsolete quota configuration data for linux and macOS hosts

macOS quota support tested on Sonoma host with Mac OS 9 client

@dgsga dgsga self-assigned this Jun 14, 2024
@dgsga dgsga force-pushed the dgsga-macquota-v3 branch 2 times, most recently from 631ffd0 to 945d62a Compare June 14, 2024 08:44
@dgsga dgsga marked this pull request as ready for review June 14, 2024 08:54
@dgsga dgsga requested a review from rdmark as a code owner June 14, 2024 08:54
meson_config.h Outdated Show resolved Hide resolved
Copy link
Member

@rdmark rdmark left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the "broken dbtob implementation" common knowledge? How did you figure that you?

@dgsga
Copy link
Contributor Author

dgsga commented Jun 14, 2024

Is the "broken dbtob implementation" common knowledge? How did you figure that you?

I referred back to the quota macro in the autotools netatalk.m4 kitchen sink macro and noticed that this config flag had not been passed over to meson.

dnl ----- Linux specific -----
if test x"$this_os" = "xlinux"; then
	AC_MSG_RESULT([ * Linux specific configuration])
    AC_DEFINE(LINUX, 1, [OS is Linux])	
	dnl ----- check if we need the quotactl wrapper
    AC_CHECK_HEADERS(linux/dqblk_xfs.h,,
		[AC_CHECK_HEADERS(linux/xqm.h linux/xfs_fs.h)
        	AC_CHECK_HEADERS(xfs/libxfs.h xfs/xqm.h xfs/xfs_fs.h)]
	)


	dnl ----- as far as I can tell, dbtob always does the wrong thing
	dnl ----- on every single version of linux I've ever played with.
	dnl ----- see etc/afpd/quota.c
	AC_DEFINE(HAVE_BROKEN_DBTOB, 1, [Define if dbtob is broken])
fi

@dgsga dgsga merged commit ad81fee into main Jun 14, 2024
14 checks passed
@dgsga dgsga deleted the dgsga-macquota-v3 branch June 14, 2024 16:54
Copy link

sonarcloud bot commented Jun 14, 2024

Quality Gate Passed Quality Gate passed

Issues
1 New issue
0 Accepted issues

Measures
0 Security Hotspots
No data about Coverage
0.0% Duplication on New Code

See analysis details on SonarCloud

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants