nss-pam-ldapd branch master updated. 0.9.13-21-g441b9c6
[
Date Prev][
Date Next]
[
Thread Prev][
Thread Next]
nss-pam-ldapd branch master updated. 0.9.13-21-g441b9c6
- From: Commits of the nss-pam-ldapd project <nss-pam-ldapd-commits [at] lists.arthurdejong.org>
- To: nss-pam-ldapd-commits [at] lists.arthurdejong.org
- Reply-to: nss-pam-ldapd-users [at] lists.arthurdejong.org, nss-pam-ldapd-commits [at] lists.arthurdejong.org
- Subject: nss-pam-ldapd branch master updated. 0.9.13-21-g441b9c6
- Date: Sat, 21 Nov 2026 15:50:24 +0100 (CET)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nss-pam-ldapd".
The branch, master has been updated
via 441b9c6b7d9cbd8973ad539e4cb20be743ed38fd (commit)
via 8fbea9a92cef3aba2a58c287e7cbc03069bda118 (commit)
via a856d0da772375ef16ea946c94ba1ce8b3c888bc (commit)
via 9b45176a81798a6180bd53862de1d93e187f7017 (commit)
via 8b1cfc5f000402de27a5c55f4aca3554a930e57c (commit)
via 9bd73cadd25f05fbc6984d751599d22153110d72 (commit)
via b5bdefbec5b5ebaeb747d94c3756c65b72cd9cf8 (commit)
via b19675bf2a94c483ffbf0322b07ae96b7a776ec2 (commit)
via e0fd42461cb57254eacfa89dcbacc7bd3ad0eb3a (commit)
from bb9f3aa0a853081603264aa32b08d3384c7bd553 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://arthurdejong.org/git/nss-pam-ldapd/commit/?id=441b9c6b7d9cbd8973ad539e4cb20be743ed38fd
commit 441b9c6b7d9cbd8973ad539e4cb20be743ed38fd
Author: Arthur de Jong <arthur@arthurdejong.org>
Date: Sun Nov 15 23:50:47 2026 +0100
Add pointer to README for reporting securty issues
diff --git a/README b/README
index fdbe5cb..0f47a17 100644
--- a/README
+++ b/README
@@ -402,3 +402,6 @@ the distributor's bug tracking system. Please include as
much information as
possible (platform, output of configure if compilation fails, error messages,
output of nslcd -d, etc). Patches are more than welcome (also see the file
HACKING).
+
+For reporting security vulnerabilities see
+https://arthurdejong.org/nss-pam-ldapd/security
https://arthurdejong.org/git/nss-pam-ldapd/commit/?id=8fbea9a92cef3aba2a58c287e7cbc03069bda118
commit 8fbea9a92cef3aba2a58c287e7cbc03069bda118
Author: Arthur de Jong <arthur@arthurdejong.org>
Date: Sun Nov 15 23:12:06 2026 +0100
Check that address size matches address family
This prevents an out-of-buffer read (data from the stack) when calling
inet_ntop().
Thanks to Andrey Vasilevsky for reporting this.
diff --git a/nslcd/common.c b/nslcd/common.c
index 6083852..0cca888 100644
--- a/nslcd/common.c
+++ b/nslcd/common.c
@@ -250,17 +250,25 @@ int write_address(TFILE *fp, MYLDAP_ENTRY *entry, const
char *attr,
int read_address(TFILE *fp, char *addr, int *addrlen, int *af)
{
int32_t tmpint32;
- int len;
+ int len, xlen;
/* read address family */
READ_INT32(fp, *af);
- if ((*af != AF_INET) && (*af != AF_INET6))
+ if (*af == AF_INET)
+ {
+ xlen = 4;
+ }
+ else if (*af == AF_INET6)
+ {
+ xlen = 16;
+ }
+ else
{
log_log(LOG_WARNING, "incorrect address family specified: %d", *af);
return -1;
}
/* read address length */
READ_INT32(fp, len);
- if ((len > *addrlen) || (len <= 0))
+ if ((len != xlen) || (len > *addrlen))
{
log_log(LOG_WARNING, "address length incorrect: %d", len);
return -1;
https://arthurdejong.org/git/nss-pam-ldapd/commit/?id=a856d0da772375ef16ea946c94ba1ce8b3c888bc
commit a856d0da772375ef16ea946c94ba1ce8b3c888bc
Author: Arthur de Jong <arthur@arthurdejong.org>
Date: Sun Nov 15 19:14:11 2026 +0100
Add tests for mysprintf() function
diff --git a/tests/test_common.c b/tests/test_common.c
index f733d41..d75267b 100644
--- a/tests/test_common.c
+++ b/tests/test_common.c
@@ -2,7 +2,7 @@
test_common.c - simple test for the common module
This file is part of the nss-pam-ldapd library.
- Copyright (C) 2008, 2009, 2011, 2012, 2013 Arthur de Jong
+ Copyright (C) 2008-2026 Arthur de Jong
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -21,6 +21,7 @@
#include "config.h"
#include <stdio.h>
+#include <string.h>
#include <assert.h>
#include <sys/stat.h>
@@ -42,6 +43,19 @@ static void test_isvalidname(void)
assert(isvalidname("(foo bar)"));
}
+static void test_mysnprintf(void)
+{
+ char buffer[8]; /* fixed size buffer */
+ /* test normal string formatting */
+ assert(!mysnprintf(buffer, sizeof(buffer), "%s %d", "foo", 10));
+ assert(strcmp(buffer, "foo 10") == 0);
+ /* test string truncation (buffer too small) */
+ assert(mysnprintf(buffer, sizeof(buffer), "this string is much too long"));
+ assert(strcmp(buffer, "this st") == 0);
+ assert(mysnprintf(buffer, sizeof(buffer), "%s", "this string is much too
long"));
+ assert(strcmp(buffer, "this st") == 0);
+}
+
/* the main program... */
int main(int UNUSED(argc), char UNUSED(*argv[]))
{
@@ -62,5 +76,6 @@ int main(int UNUSED(argc), char UNUSED(*argv[]))
log_setdefaultloglevel(LOG_DEBUG);
/* run the tests */
test_isvalidname();
+ test_mysnprintf();
return 0;
}
https://arthurdejong.org/git/nss-pam-ldapd/commit/?id=9b45176a81798a6180bd53862de1d93e187f7017
commit 9b45176a81798a6180bd53862de1d93e187f7017
Author: Arthur de Jong <arthur@arthurdejong.org>
Date: Sun Nov 15 19:02:41 2026 +0100
Add extra argument checking to myldap_bind()
Thanks to Andrey Vasilevsky for reporting this.
diff --git a/nslcd/myldap.c b/nslcd/myldap.c
index 1056c37..c13d5e9 100644
--- a/nslcd/myldap.c
+++ b/nslcd/myldap.c
@@ -1128,6 +1128,12 @@ int myldap_bind(MYLDAP_SESSION *session, const char *dn,
const char *password,
MYLDAP_SEARCH *search;
static const char *attrs[2];
int rc;
+ /* check parameters */
+ if ((session == NULL) || (dn == NULL) || (password == NULL))
+ {
+ log_log(LOG_ERR, "myldap_bind(): invalid parameter passed");
+ return LDAP_LOCAL_ERROR;
+ }
/* error out when buffers are too small */
if (strlen(dn) >= sizeof(session->binddn))
{
https://arthurdejong.org/git/nss-pam-ldapd/commit/?id=8b1cfc5f000402de27a5c55f4aca3554a930e57c
commit 8b1cfc5f000402de27a5c55f4aca3554a930e57c
Author: Arthur de Jong <arthur@arthurdejong.org>
Date: Sun Nov 15 17:54:29 2026 +0100
Fix potential double free in myldap_get_ranged_values()
The myldap_get_entry() function will close the search on error and this
will prevent double closing of the search if some error in
myldap_get_entry() occurs.
Thanks to Andrey Vasilevsky for reporting this.
diff --git a/nslcd/myldap.c b/nslcd/myldap.c
index 6d44ebd..1056c37 100644
--- a/nslcd/myldap.c
+++ b/nslcd/myldap.c
@@ -1873,7 +1873,10 @@ static char **myldap_get_ranged_values(MYLDAP_ENTRY
*entry, const char *attr)
break;
entry = myldap_get_entry(search, NULL);
if (entry == NULL)
+ {
+ search = NULL; /* search is closed by myldap_get_entry() */
break;
+ }
}
/* close any started searches */
if (search != NULL)
https://arthurdejong.org/git/nss-pam-ldapd/commit/?id=9bd73cadd25f05fbc6984d751599d22153110d72
commit 9bd73cadd25f05fbc6984d751599d22153110d72
Author: Arthur de Jong <arthur@arthurdejong.org>
Date: Sun Nov 15 17:46:00 2026 +0100
Fix typo in comment
diff --git a/nslcd/myldap.c b/nslcd/myldap.c
index 3e0ee92..6d44ebd 100644
--- a/nslcd/myldap.c
+++ b/nslcd/myldap.c
@@ -1811,7 +1811,7 @@ static char **myldap_get_ranged_values(MYLDAP_ENTRY
*entry, const char *attr)
(unsigned long) strlen(attr) + 10);
return NULL;
}
- /* keep doing lookups untul we can't get any more results */
+ /* keep doing lookups until we can't get any more results */
while (1)
{
/* go over all attributes to find the ranged attribute */
https://arthurdejong.org/git/nss-pam-ldapd/commit/?id=b5bdefbec5b5ebaeb747d94c3756c65b72cd9cf8
commit b5bdefbec5b5ebaeb747d94c3756c65b72cd9cf8
Author: Arthur de Jong <arthur@arthurdejong.org>
Date: Sun Nov 15 17:27:13 2026 +0100
Add buffer length checking to search filters
This makes the uid2entry() and shadow_uid2entry() functions more robust
(not returning an entry instead of performing an LDAP search with an
incomplete filter).
Thanks to Andrey Vasilevsky for reporting this.
diff --git a/nslcd/passwd.c b/nslcd/passwd.c
index 5747802..db3732b 100644
--- a/nslcd/passwd.c
+++ b/nslcd/passwd.c
@@ -380,7 +380,13 @@ MUST_USE MYLDAP_ENTRY *uid2entry(MYLDAP_SESSION *session,
const char *uid, int *
attrs[1] = attmap_passwd_uidNumber;
attrs[2] = NULL;
/* we have to look up the entry */
- mkfilter_passwd_byname(uid, filter, sizeof(filter));
+ if (mkfilter_passwd_byname(uid, filter, sizeof(filter)))
+ {
+ log_log(LOG_ERR, "uid2entry(): filter buffer too small");
+ if (rcp != NULL)
+ *rcp = LDAP_INVALID_SYNTAX;
+ return NULL;
+ }
for (i = 0; (i < NSS_LDAP_CONFIG_MAX_BASES) && ((base = passwd_bases[i]) !=
NULL); i++)
{
search = myldap_search(session, base, passwd_scope, filter, attrs, rcp);
diff --git a/nslcd/shadow.c b/nslcd/shadow.c
index 3aab784..2f68733 100644
--- a/nslcd/shadow.c
+++ b/nslcd/shadow.c
@@ -290,7 +290,13 @@ MYLDAP_ENTRY *shadow_uid2entry(MYLDAP_SESSION *session,
const char *username,
return NULL;
}
/* we have to look up the entry */
- mkfilter_shadow_byname(username, filter, sizeof(filter));
+ if (mkfilter_shadow_byname(username, filter, sizeof(filter)))
+ {
+ log_log(LOG_ERR, "uid2shadow(): filter buffer too small");
+ if (rcp != NULL)
+ *rcp = LDAP_INVALID_SYNTAX;
+ return NULL;
+ }
for (i = 0; (i < NSS_LDAP_CONFIG_MAX_BASES) && ((base = shadow_bases[i]) !=
NULL); i++)
{
search = myldap_search(session, base, shadow_scope, filter, shadow_attrs,
rcp);
https://arthurdejong.org/git/nss-pam-ldapd/commit/?id=b19675bf2a94c483ffbf0322b07ae96b7a776ec2
commit b19675bf2a94c483ffbf0322b07ae96b7a776ec2
Author: Arthur de Jong <arthur@arthurdejong.org>
Date: Sun Nov 15 17:20:00 2026 +0100
Mark mkfilter_*() functions with __warn_unused_result__
This ensures that the outcome of the function call is always checked.
diff --git a/nslcd/alias.c b/nslcd/alias.c
index 408637d..7661d8a 100644
--- a/nslcd/alias.c
+++ b/nslcd/alias.c
@@ -5,7 +5,7 @@
Copyright (C) 1997-2005 Luke Howard
Copyright (C) 2006 West Consulting
- Copyright (C) 2006-2014 Arthur de Jong
+ Copyright (C) 2006-2026 Arthur de Jong
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -59,8 +59,8 @@ static const char *alias_attrs[3];
/* create a search filter for searching an alias by name,
return -1 on errors */
-static int mkfilter_alias_byname(const char *name,
- char *buffer, size_t buflen)
+MUST_USE static int mkfilter_alias_byname(const char *name,
+ char *buffer, size_t buflen)
{
char safename[BUFLEN_SAFENAME];
/* escape attribute */
diff --git a/nslcd/ether.c b/nslcd/ether.c
index 50fc274..70e4d8b 100644
--- a/nslcd/ether.c
+++ b/nslcd/ether.c
@@ -5,7 +5,7 @@
Copyright (C) 1997-2005 Luke Howard
Copyright (C) 2006 West Consulting
- Copyright (C) 2006-2017 Arthur de Jong
+ Copyright (C) 2006-2026 Arthur de Jong
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -61,8 +61,8 @@ static const char *ether_attrs[3];
/* create a search filter for searching an ethernet address
by name, return -1 on errors */
-static int mkfilter_ether_byname(const char *name,
- char *buffer, size_t buflen)
+MUST_USE static int mkfilter_ether_byname(const char *name,
+ char *buffer, size_t buflen)
{
char safename[BUFLEN_HOSTNAME];
/* escape attribute */
@@ -88,8 +88,8 @@ static void my_ether_ntoa(const uint8_t *addr, char *buffer,
int compact)
*buffer++ = '\0';
}
-static int mkfilter_ether_byether(const struct ether_addr *addr,
- char *buffer, size_t buflen)
+MUST_USE static int mkfilter_ether_byether(const struct ether_addr *addr,
+ char *buffer, size_t buflen)
{
char addrstr1[20], addrstr2[20];
my_ether_ntoa((const uint8_t *)addr, addrstr1, 1);
diff --git a/nslcd/group.c b/nslcd/group.c
index 8a3de94..dd5211f 100644
--- a/nslcd/group.c
+++ b/nslcd/group.c
@@ -5,7 +5,7 @@
Copyright (C) 1997-2006 Luke Howard
Copyright (C) 2006 West Consulting
- Copyright (C) 2006-2015 Arthur de Jong
+ Copyright (C) 2006-2026 Arthur de Jong
Copyright (C) 2013 Steve Hill
This library is free software; you can redistribute it and/or
@@ -86,8 +86,8 @@ static const char **group_bymember_attrs = NULL;
/* create a search filter for searching a group entry
by name, return -1 on errors */
-static int mkfilter_group_byname(const char *name,
- char *buffer, size_t buflen)
+MUST_USE static int mkfilter_group_byname(const char *name,
+ char *buffer, size_t buflen)
{
char safename[BUFLEN_SAFENAME];
/* escape attribute */
@@ -103,7 +103,7 @@ static int mkfilter_group_byname(const char *name,
/* create a search filter for searching a group entry
by gid, return -1 on errors */
-static int mkfilter_group_bygid(gid_t gid, char *buffer, size_t buflen)
+MUST_USE static int mkfilter_group_bygid(gid_t gid, char *buffer, size_t
buflen)
{
gid -= nslcd_cfg->nss_gid_offset;
/* if searching for a Windows domain SID */
@@ -129,9 +129,9 @@ static int mkfilter_group_bygid(gid_t gid, char *buffer,
size_t buflen)
/* create a search filter for searching a group entry
by member uid, return -1 on errors */
-static int mkfilter_group_bymember(MYLDAP_SESSION *session,
- const char *uid,
- char *buffer, size_t buflen)
+MUST_USE static int mkfilter_group_bymember(MYLDAP_SESSION *session,
+ const char *uid,
+ char *buffer, size_t buflen)
{
char dn[BUFLEN_DN];
char safeuid[BUFLEN_SAFENAME];
@@ -160,8 +160,8 @@ static int mkfilter_group_bymember(MYLDAP_SESSION *session,
attmap_group_member, safedn);
}
-static int mkfilter_group_bymemberdn(const char *dn,
- char *buffer, size_t buflen)
+MUST_USE static int mkfilter_group_bymemberdn(const char *dn,
+ char *buffer, size_t buflen)
{
char safedn[BUFLEN_SAFEDN];
/* escape DN */
diff --git a/nslcd/host.c b/nslcd/host.c
index 2c50ca8..869594f 100644
--- a/nslcd/host.c
+++ b/nslcd/host.c
@@ -5,7 +5,7 @@
Copyright (C) 1997-2005 Luke Howard
Copyright (C) 2006 West Consulting
- Copyright (C) 2006-2014 Arthur de Jong
+ Copyright (C) 2006-2026 Arthur de Jong
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -62,7 +62,7 @@ static const char *host_attrs[3];
/* create a search filter for searching a host entry
by name, return -1 on errors */
-static int mkfilter_host_byname(const char *name, char *buffer, size_t buflen)
+MUST_USE static int mkfilter_host_byname(const char *name, char *buffer,
size_t buflen)
{
char safename[BUFLEN_HOSTNAME];
/* escape attribute */
@@ -76,8 +76,8 @@ static int mkfilter_host_byname(const char *name, char
*buffer, size_t buflen)
host_filter, attmap_host_cn, safename);
}
-static int mkfilter_host_byaddr(const char *addrstr,
- char *buffer, size_t buflen)
+MUST_USE static int mkfilter_host_byaddr(const char *addrstr,
+ char *buffer, size_t buflen)
{
char safeaddr[64];
/* escape attribute */
diff --git a/nslcd/netgroup.c b/nslcd/netgroup.c
index 50c54bb..c5101b2 100644
--- a/nslcd/netgroup.c
+++ b/nslcd/netgroup.c
@@ -5,7 +5,7 @@
Copyright (C) 1997-2005 Luke Howard
Copyright (C) 2006 West Consulting
- Copyright (C) 2006-2014 Arthur de Jong
+ Copyright (C) 2006-2026 Arthur de Jong
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -60,8 +60,8 @@ const char *attmap_netgroup_memberNisNetgroup =
"memberNisNetgroup";
/* the attribute list to request with searches */
static const char *netgroup_attrs[4];
-static int mkfilter_netgroup_byname(const char *name,
- char *buffer, size_t buflen)
+MUST_USE static int mkfilter_netgroup_byname(const char *name,
+ char *buffer, size_t buflen)
{
char safename[BUFLEN_SAFENAME];
/* escape attribute */
diff --git a/nslcd/network.c b/nslcd/network.c
index 14a92da..c7fb217 100644
--- a/nslcd/network.c
+++ b/nslcd/network.c
@@ -5,7 +5,7 @@
Copyright (C) 1997-2005 Luke Howard
Copyright (C) 2006 West Consulting
- Copyright (C) 2006-2014 Arthur de Jong
+ Copyright (C) 2006-2026 Arthur de Jong
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -60,8 +60,8 @@ static const char *network_attrs[3];
/* create a search filter for searching a network entry
by name, return -1 on errors */
-static int mkfilter_network_byname(const char *name,
- char *buffer, size_t buflen)
+MUST_USE static int mkfilter_network_byname(const char *name,
+ char *buffer, size_t buflen)
{
char safename[BUFLEN_HOSTNAME];
/* escape attribute */
@@ -75,8 +75,8 @@ static int mkfilter_network_byname(const char *name,
network_filter, attmap_network_cn, safename);
}
-static int mkfilter_network_byaddr(const char *addrstr,
- char *buffer, size_t buflen)
+MUST_USE static int mkfilter_network_byaddr(const char *addrstr,
+ char *buffer, size_t buflen)
{
char safeaddr[64];
/* escape attribute */
diff --git a/nslcd/passwd.c b/nslcd/passwd.c
index 19d5ec0..5747802 100644
--- a/nslcd/passwd.c
+++ b/nslcd/passwd.c
@@ -5,7 +5,7 @@
Copyright (C) 1997-2005 Luke Howard
Copyright (C) 2006 West Consulting
- Copyright (C) 2006-2024 Arthur de Jong
+ Copyright (C) 2006-2026 Arthur de Jong
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -82,7 +82,7 @@ static const char **passwd_attrs = NULL;
/* create a search filter for searching a passwd entry
by name, return -1 on errors */
-static int mkfilter_passwd_byname(const char *name,
+MUST_USE static int mkfilter_passwd_byname(const char *name,
char *buffer, size_t buflen)
{
char safename[BUFLEN_SAFENAME];
@@ -99,7 +99,7 @@ static int mkfilter_passwd_byname(const char *name,
/* create a search filter for searching a passwd entry
by uid, return -1 on errors */
-static int mkfilter_passwd_byuid(uid_t uid, char *buffer, size_t buflen)
+MUST_USE static int mkfilter_passwd_byuid(uid_t uid, char *buffer, size_t
buflen)
{
uid -= nslcd_cfg->nss_uid_offset;
if (uidSid != NULL)
@@ -360,7 +360,7 @@ char *dn2uid(MYLDAP_SESSION *session, const char *dn, char
*buf, size_t buflen)
return uid;
}
-MYLDAP_ENTRY *uid2entry(MYLDAP_SESSION *session, const char *uid, int *rcp)
+MUST_USE MYLDAP_ENTRY *uid2entry(MYLDAP_SESSION *session, const char *uid, int
*rcp)
{
MYLDAP_SEARCH *search = NULL;
MYLDAP_ENTRY *entry = NULL;
diff --git a/nslcd/protocol.c b/nslcd/protocol.c
index aaec022..4f02612 100644
--- a/nslcd/protocol.c
+++ b/nslcd/protocol.c
@@ -5,7 +5,7 @@
Copyright (C) 1997-2005 Luke Howard
Copyright (C) 2006 West Consulting
- Copyright (C) 2006-2014 Arthur de Jong
+ Copyright (C) 2006-2026 Arthur de Jong
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -60,8 +60,8 @@ const char *attmap_protocol_ipProtocolNumber =
"ipProtocolNumber";
/* the attribute list to request with searches */
static const char *protocol_attrs[3];
-static int mkfilter_protocol_byname(const char *name,
- char *buffer, size_t buflen)
+MUST_USE static int mkfilter_protocol_byname(const char *name,
+ char *buffer, size_t buflen)
{
char safename[BUFLEN_SAFENAME];
/* escape attribute */
@@ -77,8 +77,8 @@ static int mkfilter_protocol_byname(const char *name,
/* create a search filter for searching a protocol entry
by uid, return -1 on errors */
-static int mkfilter_protocol_bynumber(int protocol,
- char *buffer, size_t buflen)
+MUST_USE static int mkfilter_protocol_bynumber(int protocol,
+ char *buffer, size_t buflen)
{
return mysnprintf(buffer, buflen, "(&%s(%s=%d))",
protocol_filter, attmap_protocol_ipProtocolNumber,
protocol);
diff --git a/nslcd/rpc.c b/nslcd/rpc.c
index 11dedcb..f99a4a8 100644
--- a/nslcd/rpc.c
+++ b/nslcd/rpc.c
@@ -5,7 +5,7 @@
Copyright (C) 1997-2005 Luke Howard
Copyright (C) 2006 West Consulting
- Copyright (C) 2006-2014 Arthur de Jong
+ Copyright (C) 2006-2026 Arthur de Jong
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -62,7 +62,7 @@ const char *attmap_rpc_oncRpcNumber = "oncRpcNumber";
/* the attribute list to request with searches */
static const char *rpc_attrs[3];
-static int mkfilter_rpc_byname(const char *name, char *buffer, size_t buflen)
+MUST_USE static int mkfilter_rpc_byname(const char *name, char *buffer, size_t
buflen)
{
char safename[BUFLEN_SAFENAME];
/* escape attribute */
@@ -76,7 +76,7 @@ static int mkfilter_rpc_byname(const char *name, char
*buffer, size_t buflen)
rpc_filter, attmap_rpc_cn, safename);
}
-static int mkfilter_rpc_bynumber(int number, char *buffer, size_t buflen)
+MUST_USE static int mkfilter_rpc_bynumber(int number, char *buffer, size_t
buflen)
{
return mysnprintf(buffer, buflen, "(&%s(%s=%d))",
rpc_filter, attmap_rpc_oncRpcNumber, number);
diff --git a/nslcd/service.c b/nslcd/service.c
index 1ec70c3..a7855de 100644
--- a/nslcd/service.c
+++ b/nslcd/service.c
@@ -5,7 +5,7 @@
Copyright (C) 1997-2005 Luke Howard
Copyright (C) 2006 West Consulting
- Copyright (C) 2006-2014 Arthur de Jong
+ Copyright (C) 2006-2026 Arthur de Jong
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -63,8 +63,8 @@ const char *attmap_service_ipServiceProtocol =
"ipServiceProtocol";
/* the attribute list to request with searches */
static const char *service_attrs[4];
-static int mkfilter_service_byname(const char *name, const char *protocol,
- char *buffer, size_t buflen)
+MUST_USE static int mkfilter_service_byname(const char *name, const char
*protocol,
+ char *buffer, size_t buflen)
{
char safename[BUFLEN_SAFENAME], safeprotocol[BUFLEN_SAFENAME];
/* escape attributes */
@@ -90,8 +90,8 @@ static int mkfilter_service_byname(const char *name, const
char *protocol,
service_filter, attmap_service_cn, safename);
}
-static int mkfilter_service_bynumber(int number, const char *protocol,
- char *buffer, size_t buflen)
+MUST_USE static int mkfilter_service_bynumber(int number, const char *protocol,
+ char *buffer, size_t buflen)
{
char safeprotocol[BUFLEN_SAFENAME];
if (*protocol != '\0')
diff --git a/nslcd/shadow.c b/nslcd/shadow.c
index d687eea..3aab784 100644
--- a/nslcd/shadow.c
+++ b/nslcd/shadow.c
@@ -5,7 +5,7 @@
Copyright (C) 1997-2005 Luke Howard
Copyright (C) 2006 West Consulting
- Copyright (C) 2006-2014 Arthur de Jong
+ Copyright (C) 2006-2026 Arthur de Jong
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -68,7 +68,7 @@ static const char *default_shadow_userPassword = "*"; /*
unmatchable */
/* the attribute list to request with searches */
static const char **shadow_attrs = NULL;
-static int mkfilter_shadow_byname(const char *name, char *buffer, size_t
buflen)
+MUST_USE static int mkfilter_shadow_byname(const char *name, char *buffer,
size_t buflen)
{
char safename[BUFLEN_SAFENAME];
/* escape attribute */
https://arthurdejong.org/git/nss-pam-ldapd/commit/?id=e0fd42461cb57254eacfa89dcbacc7bd3ad0eb3a
commit e0fd42461cb57254eacfa89dcbacc7bd3ad0eb3a
Author: Arthur de Jong <arthur@arthurdejong.org>
Date: Sun Nov 15 16:15:14 2026 +0100
Fix crash when doing pwmod with asroot when rootpwmoddn is not set
Thanks to Andrey Vasilevsky for reporting this crash (NULL pointer
dereference) which could result in a local DoS of nslcd if it is not
always restarted.
diff --git a/nslcd/pam.c b/nslcd/pam.c
index 37ac8f5..7e4f8ae 100644
--- a/nslcd/pam.c
+++ b/nslcd/pam.c
@@ -2,7 +2,7 @@
pam.c - pam processing routines
Copyright (C) 2009 Howard Chu
- Copyright (C) 2009-2018 Arthur de Jong
+ Copyright (C) 2009-2026 Arthur de Jong
Copyright (C) 2015 Nokia Solutions and Networks
This library is free software; you can redistribute it and/or
@@ -826,6 +826,14 @@ int nslcd_pam_pwmod(TFILE *fp, MYLDAP_SESSION *session,
uid_t calleruid)
/* check if the the user passed the rootpwmoddn */
if (asroot)
{
+ if (nslcd_cfg->rootpwmoddn == NULL)
+ {
+ log_log(LOG_NOTICE, "rootpwmoddn not configured");
+ /* we break the protocol */
+ memset(oldpassword, 0, sizeof(oldpassword));
+ memset(newpassword, 0, sizeof(newpassword));
+ return -1;
+ }
binddn = nslcd_cfg->rootpwmoddn;
/* check if rootpwmodpw should be used */
if ((*oldpassword == '\0') && (calleruid == 0) &&
-----------------------------------------------------------------------
Summary of changes:
README | 3 +++
nslcd/alias.c | 6 +++---
nslcd/common.c | 14 +++++++++++---
nslcd/ether.c | 10 +++++-----
nslcd/group.c | 18 +++++++++---------
nslcd/host.c | 8 ++++----
nslcd/myldap.c | 11 ++++++++++-
nslcd/netgroup.c | 6 +++---
nslcd/network.c | 10 +++++-----
nslcd/pam.c | 10 +++++++++-
nslcd/passwd.c | 16 +++++++++++-----
nslcd/protocol.c | 10 +++++-----
nslcd/rpc.c | 6 +++---
nslcd/service.c | 10 +++++-----
nslcd/shadow.c | 12 +++++++++---
tests/test_common.c | 17 ++++++++++++++++-
16 files changed, 111 insertions(+), 56 deletions(-)
hooks/post-receive
--
nss-pam-ldapd
- nss-pam-ldapd branch master updated. 0.9.13-21-g441b9c6,
Commits of the nss-pam-ldapd project