diff options
| -rw-r--r-- | config.make.in | 3 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | libshouldbeinlibc/Makefile | 2 | ||||
| -rw-r--r-- | libshouldbeinlibc/idvec-verify.c | 15 | ||||
| -rw-r--r-- | utils/x.c | 7 |
5 files changed, 23 insertions, 9 deletions
diff --git a/config.make.in b/config.make.in index 7b62e851..28d4501e 100644 --- a/config.make.in +++ b/config.make.in @@ -96,6 +96,9 @@ libblkid_LIBS = @libblkid_LIBS@ # Whether Sun RPC support is available. HAVE_SUN_RPC = @HAVE_SUN_RPC@ +# Whether we found libcrypt. +HAVE_LIBCRYPT = @HAVE_LIBCRYPT@ + # Whether we found libgcrypt. HAVE_LIBGCRYPT = @HAVE_LIBGCRYPT@ diff --git a/configure.ac b/configure.ac index e8bdc46a..d0d03e8d 100644 --- a/configure.ac +++ b/configure.ac @@ -170,6 +170,11 @@ AC_CHECK_FUNCS(file_futimens) AC_DEFINE([UTIME_NOW],[-1]) AC_DEFINE([UTIME_OMIT],[-2]) +AC_CHECK_LIB([crypt], [crypt], + [HAVE_LIBCRYPT=1 + AC_DEFINE([HAVE_LIBCRYPT], [1], [Use libcrypt])]) +AC_SUBST([HAVE_LIBCRYPT]) + # From glibc HEAD, 2007-11-07. AC_CACHE_CHECK(for -fgnu89-inline, libc_cv_gnu89_inline, [dnl diff --git a/libshouldbeinlibc/Makefile b/libshouldbeinlibc/Makefile index 04c085bb..2edf15f4 100644 --- a/libshouldbeinlibc/Makefile +++ b/libshouldbeinlibc/Makefile @@ -38,6 +38,8 @@ installhdrs = idvec.h timefmt.h maptime.h \ installhdrsubdir = . +LDLIBS += $(and $(HAVE_LIBCRYPT),-lcrypt) + OBJS = $(SRCS:.c=.o) include ../Makeconf diff --git a/libshouldbeinlibc/idvec-verify.c b/libshouldbeinlibc/idvec-verify.c index a7d95761..1c4bc494 100644 --- a/libshouldbeinlibc/idvec-verify.c +++ b/libshouldbeinlibc/idvec-verify.c @@ -27,12 +27,15 @@ #include <grp.h> #include <pwd.h> #include <shadow.h> +#ifdef HAVE_LIBCRYPT #include <crypt.h> +#else +#warning "No crypt on this system! Using plain-text passwords." +#define crypt(password, encrypted) password +#endif #define SHADOW_PASSWORD_STRING "x" /* pw_passwd contents for shadow passwd */ -#pragma weak crypt - static error_t verify_id (); /* FWD */ /* Get a password from the user, returning it in malloced storage. */ @@ -71,12 +74,8 @@ verify_passwd (const char *password, if (sys_encrypted[0] == '\0') return 0; /* No password. */ - if (crypt) - /* Encrypt the password entered by the user (SYS_ENCRYPTED is the salt). */ - encrypted = crypt (password, sys_encrypted); - else - /* No crypt on this system! Use plain-text passwords. */ - encrypted = password; + /* Encrypt the password entered by the user (SYS_ENCRYPTED is the salt). */ + encrypted = crypt (password, sys_encrypted); if (! encrypted) /* Crypt failed. */ @@ -30,6 +30,12 @@ #include <grp.h> #include <netdb.h> #include <time.h> +#ifdef HAVE_LIBCRYPT +#include <crypt.h> +#else +#warning "No crypt on this system! Using plain-text passwords." +#define crypt(password, encrypted) password +#endif #include <netinet/in.h> #include <arpa/inet.h> @@ -136,7 +142,6 @@ count_parent_gids () void verify_passwd (const char *name, const char *password, uid_t id, int is_group, structh auth *auth) { - extern char *crypt (const char salt[2], const char *string); char *prompt, *unencrypted, *encrypted; if (!password || !*password |