Skip to content

Commit

Permalink
Merge pull request cyrusimap#5104 from dilyanpalauzov/remove_kerberos4
Browse files Browse the repository at this point in the history
Remove Kerberos 4 support
  • Loading branch information
ksmurchison authored Nov 1, 2024
2 parents 672416c + bf5b1ba commit 75b9d29
Show file tree
Hide file tree
Showing 36 changed files with 69 additions and 1,713 deletions.
4 changes: 1 addition & 3 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -1453,7 +1453,6 @@ lib_libcyrus_la_SOURCES = \
lib/acl.c \
lib/acl_afs.c \
lib/auth.c \
lib/auth_krb.c \
lib/auth_krb5.c \
lib/auth_mboxgroups.c \
lib/auth_pts.c \
Expand Down Expand Up @@ -1614,8 +1613,7 @@ dist_man3_MANS = \

dist_man5_MANS = \
man/cyrus.conf.5 \
man/imapd.conf.5 \
man/krb.equiv.5
man/imapd.conf.5

dist_man8_MANS = \
man/arbitron.8 \
Expand Down
8 changes: 8 additions & 0 deletions changes/next/remove_krb4
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Description:

Remove Kerberos 4 support

Config changes:

In imapd.conf srvtab is not valid anymore.
./configure does not accept --enable-krb5afspts , ptclient/afskrb.c works now only with KRB5.
4 changes: 2 additions & 2 deletions cmulocal/README.andrew
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ CMU_SASL

Provides --with-sasldir.

CMU_KRB4
This attempts to find Kerberos 4 libraries and set up CFLAGS and LIBS
CMU_KRB5
This attempts to find Kerberos 5 libraries and set up CFLAGS and LIBS
appropriately. It also updates and substitutes RPATH for shared library
stuff.

153 changes: 0 additions & 153 deletions cmulocal/arx.m4

This file was deleted.

166 changes: 0 additions & 166 deletions cmulocal/kafs.m4

This file was deleted.

Loading

0 comments on commit 75b9d29

Please sign in to comment.