Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 7d5770e

Browse files
committed
Check for and set HAVE_CRYPT_H if <crypt.h> exists
include crypt.h in password.c if crypt.h does exist
1 parent 419b430 commit 7d5770e

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

src/backend/libpq/password.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
#include <libpq/libpq.h>
55
#include <string.h>
66
#include <unistd.h>
7+
#ifdef HAVE_CRYPT
8+
# include <crypt.h>
9+
#endif
710

811
int
912
verify_password(char *user, char *password, Port *port,

src/configure

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2304,7 +2304,7 @@ else
23042304
fi
23052305
done
23062306

2307-
for ac_hdr in readline.h history.h dld.h
2307+
for ac_hdr in readline.h history.h dld.h crypt.h
23082308
do
23092309
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
23102310
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -2997,7 +2997,7 @@ else
29972997
fi
29982998
done
29992999

3000-
for ac_func in sigprocmask waitpid setsid
3000+
for ac_func in sigprocmask waitpid setsid
30013001
do
30023002
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
30033003
echo "configure:3004: checking for $ac_func" >&5

src/configure.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ dnl Checks for header files.
127127
AC_HEADER_STDC
128128
AC_HEADER_SYS_WAIT
129129
AC_CHECK_HEADERS(limits.h unistd.h termios.h values.h sys/select.h)
130-
AC_CHECK_HEADERS(readline.h history.h dld.h)
130+
AC_CHECK_HEADERS(readline.h history.h dld.h crypt.h)
131131

132132
dnl Checks for typedefs, structures, and compiler characteristics.
133133
AC_C_CONST
@@ -160,7 +160,7 @@ AC_FUNC_MEMCMP
160160
AC_TYPE_SIGNAL
161161
AC_FUNC_VPRINTF
162162
AC_CHECK_FUNCS(isinf tzset getrusage vfork memmove sigsetjmp kill sysconf)
163-
AC_CHECK_FUNCS(sigprocmask waitpid setsid)
163+
AC_CHECK_FUNCS(sigprocmask waitpid setsid )
164164
AC_CHECK_FUNC(inet_aton, AC_DEFINE(HAVE_INET_ATON), INET_ATON='inet_aton.o')
165165
AC_CHECK_FUNC(strerror, AC_DEFINE(HAVE_STRERROR), STRERROR='strerror.o')
166166
AC_CHECK_FUNC(strdup, AC_DEFINE(HAVE_STRDUP), STRDUP='../../utils/strdup.o')

src/include/config.h.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414
* The following is set using configure.
1515
*/
1616

17+
/* Set to 1 if you have <crypt.h> */
18+
#undef HAVE_CRYPT_H
19+
1720
/* Set to 1 if you have <termios.h> */
1821
#undef HAVE_TERMIOS_H
1922

0 commit comments

Comments
 (0)