[packages/pam-pam_ldap] rel 4; rediff patches
arekm
arekm at pld-linux.org
Thu Feb 2 08:53:29 CET 2023
commit 3e3326f0660937dd7059f2c1a1aab4515c889a9c
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Thu Feb 2 08:53:25 2023 +0100
rel 4; rediff patches
pam-pam_ldap-chkuser.patch | 80 +++++++++++++++++++++++-----------------------
pam-pam_ldap.spec | 2 +-
2 files changed, 41 insertions(+), 41 deletions(-)
---
diff --git a/pam-pam_ldap.spec b/pam-pam_ldap.spec
index 22a310c..2cbb77b 100644
--- a/pam-pam_ldap.spec
+++ b/pam-pam_ldap.spec
@@ -5,7 +5,7 @@ Summary(pl.UTF-8): Moduł PAM do uwierzytelniania z użyciem LDAP
Summary(pt_BR.UTF-8): Módulo de autenticação plugável (PAM) para o LDAP
Name: pam-%{modulename}
Version: 186
-Release: 3
+Release: 4
Epoch: 1
License: LGPL
Group: Base
diff --git a/pam-pam_ldap-chkuser.patch b/pam-pam_ldap-chkuser.patch
index eaceab7..a3c1313 100644
--- a/pam-pam_ldap-chkuser.patch
+++ b/pam-pam_ldap-chkuser.patch
@@ -1,7 +1,34 @@
-diff -ur pam_ldap-107.orig/pam_ldap.c pam_ldap-107/pam_ldap.c
---- pam_ldap-107.orig/pam_ldap.c Sat Apr 14 04:08:12 2001
-+++ pam_ldap-107/pam_ldap.c Sat Apr 21 06:28:10 2001
-@@ -645,6 +645,15 @@
+diff -urNp -x '*.orig' pam_ldap-186.org/ldap.conf pam_ldap-186/ldap.conf
+--- pam_ldap-186.org/ldap.conf 2010-11-08 01:58:44.000000000 +0100
++++ pam_ldap-186/ldap.conf 2023-02-02 08:53:01.469147609 +0100
+@@ -37,6 +37,23 @@ base dc=padl,dc=com
+ # Optional: default is no credential.
+ #bindpw secret
+
++# BEGIN PLD Linux specific options
++
++# Enabling userconnect check feature allows you
++# to make a connection to LDAP server using
++# user DN and password given by application,
++# but without fetching any data from LDAP server!
++# If connect succeeds then we're authenticated.
++
++# Enable support.
++#userconnect_check yes
++
++# The distinguished name to bind to the server with
++# A_USER macro will be expanded into username.
++#userdn cn=A_USER,dc=padl,dc=com
++
++# END PLD Linux specific options
++
+ # The distinguished name to bind to the server with
+ # if the effective user ID is root. Password is
+ # stored in /etc/ldap.secret (mode 600)
+diff -urNp -x '*.orig' pam_ldap-186.org/pam_ldap.c pam_ldap-186/pam_ldap.c
+--- pam_ldap-186.org/pam_ldap.c 2010-11-08 01:58:44.000000000 +0100
++++ pam_ldap-186/pam_ldap.c 2023-02-02 08:53:01.469147609 +0100
+@@ -878,6 +878,15 @@ _read_config (const char *configFile, pa
else if (!strcasecmp (v, "always"))
result->deref = LDAP_DEREF_ALWAYS;
}
@@ -17,7 +44,7 @@ diff -ur pam_ldap-107.orig/pam_ldap.c pam_ldap-107/pam_ldap.c
else if (!strcasecmp (k, "pam_password"))
{
if (!strcasecmp (v, "clear"))
-@@ -1696,6 +1705,63 @@
+@@ -2865,6 +2874,63 @@ nxt:
return PAM_SUCCESS;
}
@@ -81,7 +108,7 @@ diff -ur pam_ldap-107.orig/pam_ldap.c pam_ldap-107/pam_ldap.c
static int
_pam_ldap_get_session (pam_handle_t * pamh, const char *username,
const char *configFile, pam_ldap_session_t ** psession)
-@@ -1744,7 +1808,7 @@
+@@ -2932,7 +2998,7 @@ _pam_ldap_get_session (pam_handle_t * pa
{
_release_config (&session->conf);
#endif /* YPLDAPD */
@@ -90,7 +117,7 @@ diff -ur pam_ldap-107.orig/pam_ldap.c pam_ldap-107/pam_ldap.c
if (rc != PAM_SUCCESS)
{
_release_config (&session->conf);
-@@ -1849,9 +1913,13 @@
+@@ -3039,9 +3105,13 @@ _do_authentication (pam_handle_t *pamh,
if (session->info == NULL)
{
@@ -106,8 +133,8 @@ diff -ur pam_ldap-107.orig/pam_ldap.c pam_ldap-107/pam_ldap.c
+ return rc;
}
- rc = _reopen (session);
-@@ -2187,6 +2255,35 @@
+ rc = _session_reopen (session);
+@@ -3404,6 +3474,35 @@ _conv_sendmsg (struct pam_conv *aconv,
&resp, aconv->appdata_ptr);
}
@@ -143,10 +170,10 @@ diff -ur pam_ldap-107.orig/pam_ldap.c pam_ldap-107/pam_ldap.c
PAM_EXTERN int
pam_sm_authenticate (pam_handle_t * pamh,
int flags, int argc, const char **argv)
-diff -ur pam_ldap-107.orig/pam_ldap.h pam_ldap-107/pam_ldap.h
---- pam_ldap-107.orig/pam_ldap.h Sat Apr 14 04:03:44 2001
-+++ pam_ldap-107/pam_ldap.h Sat Apr 21 05:21:39 2001
-@@ -44,6 +44,11 @@
+diff -urNp -x '*.orig' pam_ldap-186.org/pam_ldap.h pam_ldap-186/pam_ldap.h
+--- pam_ldap-186.org/pam_ldap.h 2010-11-08 01:58:44.000000000 +0100
++++ pam_ldap-186/pam_ldap.h 2023-02-02 08:53:01.469147609 +0100
+@@ -62,6 +62,11 @@ typedef struct pam_ldap_config
int scope;
/* deref policy */
int deref;
@@ -158,30 +185,3 @@ diff -ur pam_ldap-107.orig/pam_ldap.h pam_ldap-107/pam_ldap.h
/* bind dn/pw for "anonymous" authentication */
char *binddn;
char *bindpw;
-diff -ur pam_ldap-107.orig/ldap.conf pam_ldap-107/ldap.conf
---- pam_ldap-107.orig/ldap.conf Sat Apr 21 17:07:34 2001
-+++ pam_ldap-107/ldap.conf Sat Apr 21 17:12:15 2001
-@@ -33,6 +33,23 @@
- # Optional: default is no credential.
- #bindpw secret
-
-+# BEGIN PLD Linux specific options
-+
-+# Enabling userconnect check feature allows you
-+# to make a connection to LDAP server using
-+# user DN and password given by application,
-+# but without fetching any data from LDAP server!
-+# If connect succeeds then we're authenticated.
-+
-+# Enable support.
-+#userconnect_check yes
-+
-+# The distinguished name to bind to the server with
-+# A_USER macro will be expanded into username.
-+#userdn cn=A_USER,dc=padl,dc=com
-+
-+# END PLD Linux specific options
-+
- # The distinguished name to bind to the server with
- # if the effective user ID is root. Password is
- # stored in /etc/ldap.secret (mode 600)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/pam-pam_ldap.git/commitdiff/3e3326f0660937dd7059f2c1a1aab4515c889a9c
More information about the pld-cvs-commit
mailing list