Skip to content

Commit cd3d37a

Browse files
committed
Merge remote-tracking branch 'origin/master' into dev-docker-build-from-src
2 parents 49e953e + 4d24130 commit cd3d37a

928 files changed

Lines changed: 14961 additions & 6779 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/contributing.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@ problem that doesn't require additional code, or may have ideas as to how your p
7171
in a way that will better fit with the long-term vision for the server.
7272

7373
Once you've got the go ahead, please read through the
74-
[coding standards document](https://wiki.freeradius.org/contributing/coding-standards).
74+
[coding standards](https://www.freeradius.org/documentation/freeradius-server/4.0.0/developers/coding-methods.html) document.
7575

7676
If you're creating a new module you may wish to read the
77-
[module creation guide](https://wiki.freeradius.org/contributing/Modules3).
77+
[module creation guide](https://www.freeradius.org/documentation/freeradius-server/4.0.0/developers/module_interface.html).
7878

7979
You may also wish to utilise the [doxygen site](https://doc.freeradius.org) to review code documentation.
8080

@@ -84,7 +84,7 @@ commit to the master branch of the freeradius-server repository.
8484

8585
Finally, this file was written to be displayed automatically on the GitHub issue tracker, so
8686
Git/GitHub knowledge is assumed. If you're wondering what a pull-request is, this document may be of
87-
some use <https://wiki.freeradius.org/contributing/GitHub>.
87+
some use <https://www.freeradius.org/documentation/freeradius-server/4.0.0/developers/github.html>
8888

8989

9090
## Continuous Integration Tests (CIT)

.github/workflows/ci-macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
pull_request:
1010

1111
env:
12-
ASAN_OPTIONS: symbolize=1 detect_leaks=1 detect_stack_use_after_return=1
12+
ASAN_OPTIONS: symbolize=1 detect_leaks=0 detect_stack_use_after_return=1
1313
LSAN_OPTIONS: fast_unwind_on_malloc=0:malloc_context_size=50
1414
UBSAN_OPTIONS: print_stacktrace=1
1515
M_PERTURB: "0x42"

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ icon.png
5252
# OS specific cruft
5353
.DS_Store
5454

55+
# Claude Code
56+
CLAUDE.md
57+
5558
# Archives
5659
freeradius-server-*tar*
5760

AGENTS.md

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
# Policy on AI Agents
2+
3+
> [!IMPORTANT]
4+
> This project does **not** accept pull requests that are fully or
5+
> predominantly AI-generated. AI tools may be utilized solely to
6+
> assist individual development.
7+
>
8+
> If we receive an AI PR that _clearly has had zero testing_, then we
9+
> will **ban the person who submitted the PR**.
10+
>
11+
> Submitting a garbage PR isn't just AI slop, it's abuse.
12+
13+
AI assistance is fine. But when someone submits a PR, we assume that
14+
they understand the submission, and that they accept full
15+
responsibility for it.
16+
17+
---
18+
19+
## Recommendations for Using AI
20+
21+
AI can be useful in some situations. However, our experience has been
22+
that when people ask AI questions about FreeRADIUS, the answers are
23+
pretty bad. The advice is either unclear, or is simply wrong. This
24+
means that AI should be used to point you in a direction, but you
25+
should read the documentation to get the _truthful_ answers:
26+
27+
> READ THE DOCS!
28+
>
29+
> https://www.freeradius.org/documentation/freeradius-server/
30+
31+
AI can help in the following use cases:
32+
33+
- Code completion in an editor,
34+
- Asking about the structure of the code,
35+
- Learning about specific techniques used in the project,
36+
- Finding documents, links, and parts of the code that are worth your time
37+
- Reviewing human-written code and providing suggestions on things you hadn't thought of,
38+
- Creating rough outlines for documentation,
39+
40+
Anything AI generated _must_ be reviewed, edited, and approved by a person.
41+
42+
## Disclosure
43+
44+
**All AI contributions must be disclosed.**
45+
46+
If you use AI in an editor for API suggestions, searching the code,
47+
etc., that doesn't need to be disclosed. You are the person writing
48+
the code, not the AI.
49+
50+
If you use AI to _generate_ code, it **must** be disclosed. The code
51+
that AI generates is pretty much always wrong. We need to know if the
52+
PR is AI slop, or if it has been reviewed and understood by a person.

CREDITS

Lines changed: 0 additions & 2 deletions
This file was deleted.

Make.inc.in

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,8 @@ mibdir = @mibdir@
2020
logdir = @logdir@
2121
includedir = @includedir@
2222

23-
#
24-
# In some systems, we don't want to over-write ANY configuration.
25-
# So we do:
26-
#
27-
# $./configure
28-
# $ make
29-
# $ make -Draddbdir=/tmp/garbage install
30-
#
31-
# and all of the configuration files go into /tmp/garbage
32-
#
33-
ifeq "${raddbdir}" ""
34-
raddbdir = @raddbdir@
35-
endif
36-
modconfdir = @modconfdir@
23+
confdir = @confdir@
24+
modconfdir = ${confdir}/mods-config
3725
radacctdir = @radacctdir@
3826
top_builddir = @abs_top_builddir@
3927
top_build_prefix=@abs_top_builddir@/
@@ -131,7 +119,7 @@ LIBS = $(OPENSSL_LIBS) $(TALLOC_LIBS) $(KQUEUE_LIBS) @LIBS@
131119
LDFLAGS = $(OPENSSL_LDFLAGS) $(TALLOC_LDFLAGS) $(KQUEUE_LDFLAGS) @LDFLAGS@
132120

133121
LOGDIR = ${logdir}
134-
RADDBDIR = ${raddbdir}
122+
CONFDIR = ${confdir}
135123
RUNDIR = ${localstatedir}/run/radiusd
136124
SBINDIR = ${sbindir}
137125
RADIR = ${radacctdir}

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ install.man: $(subst man/,$(R)$(mandir)/,$(MANFILES))
241241

242242
$(R)$(mandir)/%: man/%
243243
@echo INSTALL $(notdir $<)
244-
@sed -e "s,/etc/raddb,$(raddbdir),g" \
244+
@sed -e "s,/etc/raddb,$(confdir),g" \
245245
-e "s,/usr/local/share,$(datarootdir),g" \
246246
$< > $<.subst
247247
@$(INSTALL) -m 644 $<.subst $@
@@ -260,10 +260,10 @@ ifneq ($(RADMIN),)
260260
ifneq ($(RGROUP),)
261261
.PHONY: install-chown
262262
install-chown:
263-
chown -R $(RADMIN) $(R)$(raddbdir)
264-
chgrp -R $(RGROUP) $(R)$(raddbdir)
265-
chmod u=rwx,g=rx,o= `find $(R)$(raddbdir) -type d -print`
266-
chmod u=rw,g=r,o= `find $(R)$(raddbdir) -type f -print`
263+
chown -R $(RADMIN) $(R)$(confdir)
264+
chgrp -R $(RGROUP) $(R)$(confdir)
265+
chmod u=rwx,g=rx,o= `find $(R)$(confdir) -type d -print`
266+
chmod u=rw,g=r,o= `find $(R)$(confdir) -type f -print`
267267
chown -R $(RADMIN) $(R)$(logdir)
268268
chgrp -R $(RGROUP) $(R)$(logdir)
269269
find $(R)$(logdir) -type d -exec chmod u=rwx,g=rwx,o= {} \;

README.md

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ of people, in sites ranging from 10 to 10 million+ users.
2323
Please see the [documentation](doc/) directory, which has full
2424
documentation for version 4.
2525

26-
Please also see <https://freeradius.org> and <https://wiki.freeradius.org>
26+
Please also see <https://freeradius.org> and <https://www.freeradius.org/documentation/freeradius-server/4.0.0/>
2727
for additional documentation.
2828

2929
## Installation
@@ -70,12 +70,8 @@ which includes WARNINGs about common issues, and suggestions for how
7070
they may be fixed.
7171

7272
The debug output is explained in detail in the
73-
[radiusd-X](https://wiki.freeradius.org/radiusd-X) page on the
74-
[wiki](https://wiki.freeradius.org).
75-
76-
Many questions are answered on the Wiki:
77-
78-
<https://wiki.freeradius.org>
73+
[radiusd-X](https://www.freeradius.org/documentation/freeradius-server/4.0.0/debugging/radiusd_X.html)
74+
page.
7975

8076
Read the configuration files. Many parts of the server are
8177
documented only with extensive comments in the configuration files.
@@ -84,17 +80,21 @@ Search the mailing lists. For example, using Google, searching
8480
"site:lists.freeradius.org <search term>" will return results from
8581
the FreeRADIUS mailing lists.
8682

87-
<https://freeradius.org/support/>
83+
[Additional
84+
help](https://www.freeradius.org/documentation/freeradius-server/4.0.0/gethelp.html)
85+
is available via the mailing lists, including commercial support.
86+
87+
When posting to the mailing list, we recommend posting the output of
88+
`radiusd -X`. That information shows what the server is doing when it
89+
receives packets, and how it processes those packets.
8890

89-
Instructions for what to post on the mailing list are [on the
90-
wiki](https://wiki.freeradius.org/list-help). Please note that we DO
91-
recommend posting the output of `radiusd -X`. That information shows
92-
what the server is doing when it receives packets, and how it
93-
processes those packets.
91+
Do NOT post the configuration files to the mailing list. They're not
92+
useful. Instead, post the output of `radiusd -X`. We really cannot
93+
emphasize that enough.
9494

95-
We do NOT recommend posting the configuration files to the mailing
96-
list. They don't help. Instead, post the output of `radiusd -X`. We
97-
really cannot emphasize that enough.
95+
DO post a clear description of what the problem is. Empty questions
96+
will not make you friends. e.g. "I changed things and now it doesn't
97+
work. What do I do to fix it?"
9898

9999
## Feedback, Defects, and Community Support
100100

@@ -114,8 +114,8 @@ mailing lists first to determine whether it really is a defect or
114114
missing feature.
115115

116116
Instructions for gathering data for defect reports can be found in
117-
[here](doc/antora/modules/developers/pages/bugs.adoc) or on the
118-
[wiki](https://wiki.freeradius.org/project/bug-reports).
117+
[here](doc/antora/modules/developers/pages/bugs.adoc) and online at
118+
<https://www.freeradius.org/documentation/freeradius-server/4.0.0/developers/bugs.html>
119119

120120
Under no circumstances should the issue tracker be used for support
121121
requests, those questions belong on the user's mailing list. If you

configure

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -678,10 +678,9 @@ ACLOCAL
678678
RUSERS
679679
SNMPWALK
680680
SNMPGET
681-
modconfdir
682681
mibdir
683682
dictdir
684-
raddbdir
683+
confdir
685684
radacctdir
686685
logdir
687686
openssl_version_check_config
@@ -6219,7 +6218,7 @@ fi
62196218
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $radacctdir" >&5
62206219
printf "%s\n" "$radacctdir" >&6; }
62216220

6222-
raddbdir='${sysconfdir}/raddb'
6221+
confdir='${sysconfdir}/raddb'
62236222
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking raddbdir" >&5
62246223
printf %s "checking raddbdir... " >&6; }
62256224

@@ -6233,7 +6232,7 @@ then :
62336232
yes)
62346233
;;
62356234
[\\/$]* | ?:[\\/]* )
6236-
raddbdir="$withval"
6235+
confdir="$withval"
62376236
;;
62386237
*)
62396238
as_fn_error $? "expected an absolute directory name for --with-raddbdir: $withval" "$LINENO" 5
@@ -6243,8 +6242,8 @@ then :
62436242
fi
62446243

62456244

6246-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $raddbdir" >&5
6247-
printf "%s\n" "$raddbdir" >&6; }
6245+
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $confdir" >&5
6246+
printf "%s\n" "$confdir" >&6; }
62486247

62496248
dictdir='${datarootdir}/freeradius/dictionary'
62506249
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking dictdir" >&5
@@ -6300,8 +6299,6 @@ fi
63006299
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $mibdir" >&5
63016300
printf "%s\n" "$mibdir" >&6; }
63026301

6303-
modconfdir='${raddbdir}/mods-config'
6304-
63056302

63066303

63076304

@@ -16219,8 +16216,6 @@ fi
1621916216

1622016217
ac_config_commands="$ac_config_commands stamp-h"
1622116218

16222-
ac_config_commands="$ac_config_commands build-radpaths-h"
16223-
1622416219
ac_config_commands="$ac_config_commands main-chmod"
1622516220

1622616221
ac_config_commands="$ac_config_commands scripts-chmod"
@@ -16229,7 +16224,7 @@ ac_config_commands="$ac_config_commands scripts-chmod"
1622916224

1623016225

1623116226

16232-
ac_config_files="$ac_config_files ./Make.inc ./src/include/build-radpaths-h ./src/bin/checkrad ./src/bin/radtest ./scripts/rc.radiusd ./scripts/cron/radiusd.cron.daily ./scripts/cron/radiusd.cron.monthly ./scripts/util/cryptpasswd ./raddb/radrelay.conf ./raddb/radiusd.conf"
16227+
ac_config_files="$ac_config_files ./Make.inc ./src/bin/checkrad ./src/bin/radtest ./scripts/rc.radiusd ./scripts/cron/radiusd.cron.daily ./scripts/cron/radiusd.cron.monthly ./scripts/util/cryptpasswd ./raddb/radrelay.conf ./raddb/radiusd.conf"
1623316228

1623416229
cat >confcache <<\_ACEOF
1623516230
# This file is a shell script that caches the results of configure
@@ -16932,11 +16927,9 @@ do
1693216927
case $ac_config_target in
1693316928
"src/include/autoconf.h") CONFIG_HEADERS="$CONFIG_HEADERS src/include/autoconf.h" ;;
1693416929
"stamp-h") CONFIG_COMMANDS="$CONFIG_COMMANDS stamp-h" ;;
16935-
"build-radpaths-h") CONFIG_COMMANDS="$CONFIG_COMMANDS build-radpaths-h" ;;
1693616930
"main-chmod") CONFIG_COMMANDS="$CONFIG_COMMANDS main-chmod" ;;
1693716931
"scripts-chmod") CONFIG_COMMANDS="$CONFIG_COMMANDS scripts-chmod" ;;
1693816932
"./Make.inc") CONFIG_FILES="$CONFIG_FILES ./Make.inc" ;;
16939-
"./src/include/build-radpaths-h") CONFIG_FILES="$CONFIG_FILES ./src/include/build-radpaths-h" ;;
1694016933
"./src/bin/checkrad") CONFIG_FILES="$CONFIG_FILES ./src/bin/checkrad" ;;
1694116934
"./src/bin/radtest") CONFIG_FILES="$CONFIG_FILES ./src/bin/radtest" ;;
1694216935
"./scripts/rc.radiusd") CONFIG_FILES="$CONFIG_FILES ./scripts/rc.radiusd" ;;
@@ -17496,7 +17489,6 @@ printf "%s\n" "$as_me: executing $ac_file commands" >&6;}
1749617489
1749717490
case $ac_file$ac_mode in
1749817491
"stamp-h":C) echo timestamp > src/include/stamp-h ;;
17499-
"build-radpaths-h":C) (cd ./src/include && /bin/sh ./build-radpaths-h) ;;
1750017492
"main-chmod":C) (cd ./src/bin && chmod +x checkrad radtest) ;;
1750117493
"scripts-chmod":C) (cd ./scripts && chmod +x rc.radiusd cron/radiusd.cron.daily cron/radiusd.cron.monthly util/cryptpasswd) ;;
1750217494

configure.ac

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,7 @@ AC_MSG_RESULT($radacctdir)
740740
dnl #
741741
dnl # extra argument: --with-raddbdir
742742
dnl #
743-
raddbdir='${sysconfdir}/raddb'
743+
confdir='${sysconfdir}/raddb'
744744
AC_MSG_CHECKING(raddbdir)
745745
AC_ARG_WITH(raddbdir,
746746
[ --with-raddbdir=DIR directory for config files [SYSCONFDIR/raddb] ],
@@ -751,15 +751,15 @@ AC_ARG_WITH(raddbdir,
751751
yes)
752752
;;
753753
[[\\/$]]* | ?:[[\\/]]* )
754-
raddbdir="$withval"
754+
confdir="$withval"
755755
;;
756756
*)
757757
AC_MSG_ERROR([expected an absolute directory name for --with-raddbdir: $withval])
758758
;;
759759
esac ]
760760
)
761-
AC_SUBST(raddbdir)
762-
AC_MSG_RESULT($raddbdir)
761+
AC_SUBST(confdir)
762+
AC_MSG_RESULT($confdir)
763763

764764
dnl #
765765
dnl # extra argument: --with-dictdir
@@ -809,9 +809,6 @@ AC_ARG_WITH(mibdir,
809809
AC_SUBST(mibdir)
810810
AC_MSG_RESULT($mibdir)
811811

812-
modconfdir='${raddbdir}/mods-config'
813-
AC_SUBST(modconfdir)
814-
815812
dnl #############################################################
816813
dnl #
817814
dnl # 0e. Library/include paths
@@ -2625,7 +2622,6 @@ dnl # And finally, output the results.
26252622
dnl #
26262623
dnl #############################################################
26272624
AC_CONFIG_COMMANDS([stamp-h], [echo timestamp > src/include/stamp-h])
2628-
AC_CONFIG_COMMANDS([build-radpaths-h], [(cd ./src/include && /bin/sh ./build-radpaths-h)])
26292625
AC_CONFIG_COMMANDS([main-chmod], [(cd ./src/bin && chmod +x checkrad radtest)])
26302626
AC_CONFIG_COMMANDS([scripts-chmod], [(cd ./scripts && chmod +x rc.radiusd cron/radiusd.cron.daily cron/radiusd.cron.monthly util/cryptpasswd)])
26312627

@@ -2637,7 +2633,6 @@ AC_SUBST(INSTALLSTRIP)
26372633

26382634
AC_CONFIG_FILES([\
26392635
./Make.inc \
2640-
./src/include/build-radpaths-h \
26412636
./src/bin/checkrad \
26422637
./src/bin/radtest \
26432638
./scripts/rc.radiusd \

0 commit comments

Comments
 (0)