Skip to contentSkip to conversation

package/pam: fix uclibc compile error

PATCH Applied Waldemar Brodkorb 2 participants 2 messages Aug 27, 2023 – Sep 2, 2023

lore
Share & tools
lore

Waldemar Brodkorb

author
#0 lore raw

PATCH 1/1 package/pam: fix uclibc compile error

Following build failure occurs:
opasswd.c: In function 'compare_password':
opasswd.c:142:3: error: 'retval' undeclared (first use in this function); did you mean 'outval'?

  142 |   retval = outval != NULL && strcmp(outval, oldpass) == 0;
      |   ^~~~~~
      |   outval

Add a patch from upstream to fix it.
Happens since the update to 1.5.3 in Buildroot commit:
f8147e27cdac8f998ec6644a09ce4e8d62b6433c

Fixes:
- http://autobuild.buildroot.net/results/576/576fc4b9ccbc6cff82569692bdec82192e89f036

Signed-off-by Waldemar Brodkorb <[email protected]>
---
 ...Fix-build-if-crypt_r-isn-t-available.patch | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 package/linux-pam/0002-Fix-build-if-crypt_r-isn-t-available.patch
package/linux-pam/0002-Fix-build-if-crypt_r-isn-t-available.patch new file +37 -0
new file mode 100644
index 0000000000..c7fdd8be36
@@ -0,0 +1,37 @@
+From b82acc21f1e2f76d4cb0c75bb4958751562039ab Mon Sep 17 00:00:00 2001
+From: Bernhard Rosenkränzer <[email protected]>
+Date: Wed, 7 Jun 2023 19:49:01 +0200
+Subject: [PATCH] Fix build if crypt_r isn't available
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+retval was being defined only in #ifdef HAVE_CRYPT_R, but used
+unconditionally.
+
+Signed-off-by: Bernhard Rosenkränzer <[email protected]>
+Fixes: bcba17939e1b ("modules: make use of secure memory erasure")
+Signed-off-by: Waldemar Brodkorb <[email protected]>
+Upstream: https://github.com/linux-pam/linux-pam/commit/b82acc21f1e2f76d4cb0c75bb4958751562039ab
+---
+ modules/pam_pwhistory/opasswd.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/pam_pwhistory/opasswd.c b/modules/pam_pwhistory/opasswd.c
+index 479e3fc4..fc610e2f 100644
+--- a/modules/pam_pwhistory/opasswd.c
++++ b/modules/pam_pwhistory/opasswd.c
+@@ -128,9 +128,9 @@ static int
+ compare_password(const char *newpass, const char *oldpass)
+ {
+   char *outval;
++  int retval;
+ #ifdef HAVE_CRYPT_R
+   struct crypt_data output;
+-  int retval;
+ 
+   output.initialized = 0;
+ 
+-- 
+2.39.2
+
Signature · 6 lines
2.39.2

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Applied
#1 lore raw
Quoted 11 lines · On Sun, 27 Aug 2023 13:18:39 +0200 Waldemar Brodkorb <[email protected]> wrote:

Following build failure occurs:
opasswd.c: In function 'compare_password':
opasswd.c:142:3: error: 'retval' undeclared (first use in this function); did you mean 'outval'?

  142 |   retval = outval != NULL && strcmp(outval, oldpass) == 0;
      |   ^~~~~~
      |   outval

Add a patch from upstream to fix it.
Happens since the update to 1.5.3 in Buildroot commit:
f8147e27cdac8f998ec6644a09ce4e8d62b6433c

Quoted 8 lines

Fixes:
- http://autobuild.buildroot.net/results/576/576fc4b9ccbc6cff82569692bdec82192e89f036

Signed-off-by Waldemar Brodkorb <[email protected]>
---
 ...Fix-build-if-crypt_r-isn-t-available.patch | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 package/linux-pam/0002-Fix-build-if-crypt_r-isn-t-available.patch

Applied to master, thanks.

Thomas

Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot