passwd: fall back to non-PAM code when prefix is used
Prefix does not make sense when we use PAM, so when the option is used behave as if --with-libpam=no was used to configure the project.
This commit is contained in:
committed by
Iker Pedrosa
parent
2d0beef3bb
commit
68bf73f319
+7
-1
@@ -5,7 +5,13 @@ AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir) $(ECONF_CPPFLAGS)
|
||||
|
||||
noinst_LTLIBRARIES = libmisc.la
|
||||
|
||||
libmisc_la_CFLAGS = $(LIBBSD_CFLAGS)
|
||||
if USE_PAM
|
||||
LIBCRYPT_PAM = $(LIBCRYPT)
|
||||
else
|
||||
LIBCRYPT_PAM =
|
||||
endif
|
||||
|
||||
libmisc_la_CFLAGS = $(LIBBSD_CFLAGS) $(LIBCRYPT_PAM)
|
||||
libmisc_la_SOURCES = \
|
||||
addgrps.c \
|
||||
age.c \
|
||||
|
||||
@@ -9,8 +9,6 @@
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#ifndef USE_PAM
|
||||
|
||||
#ident "$Id$"
|
||||
|
||||
|
||||
@@ -247,7 +245,3 @@ bool obscure (const char *old, const char *new, const struct passwd *pwdp)
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
#else /* !USE_PAM */
|
||||
extern int ISO_C_forbids_an_empty_translation_unit;
|
||||
#endif /* !USE_PAM */
|
||||
|
||||
@@ -11,8 +11,6 @@
|
||||
|
||||
#ident "$Id$"
|
||||
|
||||
#ifndef USE_PAM
|
||||
|
||||
#include <sys/types.h>
|
||||
#include "prototypes.h"
|
||||
#include "defines.h"
|
||||
@@ -61,7 +59,4 @@ struct spwd *pwd_to_spwd (const struct passwd *pw)
|
||||
|
||||
return &sp;
|
||||
}
|
||||
#else /* USE_PAM */
|
||||
extern int ISO_C_forbids_an_empty_translation_unit;
|
||||
#endif /* !USE_PAM */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user