Skip to content

configure.ac, lib/Makefile.am: Respect $(bindir) in PASSWD_PROGRAM #1468

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alejandro-colomar wants to merge 2 commits into
base: master
Choose a base branch
from
+8 −10
Open

configure.ac, lib/Makefile.am: Respect $(bindir) in PASSWD_PROGRAM #1468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
01d39fc
configure.ac, lib/Makefile.am: Respect $(bindir) in PASSWD_PROGRAM
alejandro-colomar Dec 31, 2025
3348501
lib/: Rename PASSWD_PROGRAM => PATH_PASSWD
alejandro-colomar Dec 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,6 @@ done])
AC_DEFINE_UNQUOTED([FAILLOG_FILE], ["$shadow_cv_logdir/faillog"],
[Path for faillog file.])

AC_DEFINE_UNQUOTED([PASSWD_PROGRAM], ["$exec_prefix/bin/passwd"],
[Path to passwd program.])

AC_ARG_ENABLE([shadowgrp],
[AS_HELP_STRING([--enable-shadowgrp], [enable shadow group support @<:@default=yes@:>@])],
[case "${enableval}" in
Expand Down
3 changes: 2 additions & 1 deletion lib/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@

AUTOMAKE_OPTIONS = 1.0 foreign

DEFS =
DEFS = \
-DPATH_PASSWD='"$(bindir)/passwd"'

noinst_LTLIBRARIES = libshadow.la

Expand Down
12 changes: 6 additions & 6 deletions lib/age.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
#include "shadow/gshadow/endsgent.h"


#ident "$Id$"

#ifndef PASSWD_PROGRAM
#define PASSWD_PROGRAM "/bin/passwd"
#ifndef PATH_PASSWD
#define PATH_PASSWD "/bin/passwd"
#endif


/*
* expire - force password change if password expired
*
Expand Down Expand Up @@ -116,9 +116,9 @@ int expire (const struct passwd *pw, /*@null@*/const struct spwd *sp)
_exit (126);
}

(void) execl (PASSWD_PROGRAM, PASSWD_PROGRAM, pw->pw_name, (char *) NULL);
(void) execl(PATH_PASSWD, PATH_PASSWD, pw->pw_name, (char *) NULL);
err = errno;
perror ("Can't execute " PASSWD_PROGRAM);
perror("Can't execute " PATH_PASSWD);
_exit ((ENOENT == err) ? E_CMD_NOTFOUND : E_CMD_NOEXEC);
} else if ((pid_t) -1 == pid) {
perror ("fork");
Expand Down
Loading