summaryrefslogtreecommitdiff
path: root/news/nntpcache/files/patch-src-authinfo_ldap.c
diff options
context:
space:
mode:
authorDirk Meyer <dinoex@FreeBSD.org>2002-03-30 10:14:36 +0000
committerDirk Meyer <dinoex@FreeBSD.org>2002-03-30 10:14:36 +0000
commit2002767acb35541647029b8cfc513f97031e4a20 (patch)
tree59731e236647a910bb9f8b00a170046d33800936 /news/nntpcache/files/patch-src-authinfo_ldap.c
parentUse autoconf 2.53 for lang/ruby_static-devel and unbreak it. (diff)
Updated with new Option, some cleanups.
>Number: 30849 news/nntpcache fails compiling authinfo_pam.c, add radius & ldap auth mechanisms. The fix is to place a #ifndef __FreeBSD__ .. #endif arround <security/pam_misc.h> in authinfo_pam.c. The attached patch corrects this problem, and adds additional authentication functionality to the nntpcache port (RADIUS, LDAP[v1,v2]). files/patch-src-authinfo_pam.ext removed due to a post-configure target is added to the Makefile that recreates the authinfo_[pam,radius,ldap].ext files. PR: 30849 Submitted by: hetzels@westbend.net
Notes
Notes: svn path=/head/; revision=56917
Diffstat (limited to 'news/nntpcache/files/patch-src-authinfo_ldap.c')
-rw-r--r--news/nntpcache/files/patch-src-authinfo_ldap.c19
1 files changed, 19 insertions, 0 deletions
diff --git a/news/nntpcache/files/patch-src-authinfo_ldap.c b/news/nntpcache/files/patch-src-authinfo_ldap.c
new file mode 100644
index 000000000000..99b4a551cfd1
--- /dev/null
+++ b/news/nntpcache/files/patch-src-authinfo_ldap.c
@@ -0,0 +1,19 @@
+--- src/authinfo_ldap.c.orig Sat Dec 18 12:08:30 1999
++++ src/authinfo_ldap.c Wed Sep 26 10:55:27 2001
+@@ -78,7 +78,16 @@
+
+ lderr = ldap_bind_s(ld, dnbuf, pass, LDAP_AUTH_SIMPLE);
+ if (lderr != LDAP_SUCCESS && lderr != LDAP_INVALID_CREDENTIALS && lderr != LDAP_INAPPROPRIATE_AUTH)
++#if LDAP_API_VERSION >= 2004
++ {
++ int ld_errno = 0;
++ ldap_get_option(ld, LDAP_OPT_ERROR_NUMBER, &ld_errno);
++ logen(("LDAP ERROR: ldap user bind failed (%d): %s", lderr, ldap_err2string(ld_errno)));
++ }
++#else
++
+ logen(("LDAP ERROR: ldap user bind failed (%d): %s", lderr, ldap_err2string(GET_LDERROR(ld))));
++#endif
+ ldap_unbind(ld);
+ memset(pass, strlen(pass), 0);
+ if (lderr == LDAP_SUCCESS) {