Commit7d5770e

committed

Check for and set HAVE_CRYPT_H if <crypt.h> exists

include crypt.h in password.c if crypt.h does exist

1 parent419b430 commit7d5770eCopy full SHA for 7d5770e

File tree

+10

-4

lines changed

+10

-4

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,9 @@`
`4`	`4`	`#include<libpq/libpq.h>`
`5`	`5`	`#include<string.h>`
`6`	`6`	`#include<unistd.h>`
	`7`	`+#ifdefHAVE_CRYPT`
	`8`	`+# include<crypt.h>`
	`9`	`+#endif`
`7`	`10`
`8`	`11`	`int`
`9`	`12`	`verify_password(charuser,charpassword,Port*port,`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -2304,7 +2304,7 @@ else`
`2304`	`2304`	`fi`
`2305`	`2305`	`done`
`2306`	`2306`
`2307`		`-forac_hdrin readline.h history.h dld.h`
	`2307`	`+forac_hdrin readline.h history.h dld.h crypt.h`
`2308`	`2308`	`do`
`2309`	`2309`	ac_safe=`echo"$ac_hdr"\| sed'y%./+-%__p_%'`
`2310`	`2310`	`echo$ac_n"checking for$ac_hdr""...$ac_c"1>&6`
`@@ -2997,7 +2997,7 @@ else`
`2997`	`2997`	`fi`
`2998`	`2998`	`done`
`2999`	`2999`
`3000`		`-forac_funcin sigprocmask waitpid setsid`
	`3000`	`+forac_funcin sigprocmask waitpid setsid`
`3001`	`3001`	`do`
`3002`	`3002`	`echo$ac_n"checking for$ac_func""...$ac_c"1>&6`
`3003`	`3003`	`echo"configure:3004: checking for$ac_func">&5`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ dnl Checks for header files.`
`127`	`127`	`AC_HEADER_STDC`
`128`	`128`	`AC_HEADER_SYS_WAIT`
`129`	`129`	`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)`
`131`	`131`
`132`	`132`	`dnl Checks for typedefs, structures, and compiler characteristics.`
`133`	`133`	`AC_C_CONST`
`@@ -160,7 +160,7 @@ AC_FUNC_MEMCMP`
`160`	`160`	`AC_TYPE_SIGNAL`
`161`	`161`	`AC_FUNC_VPRINTF`
`162`	`162`	`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)`
`164`	`164`	`AC_CHECK_FUNC(inet_aton, AC_DEFINE(HAVE_INET_ATON), INET_ATON='inet_aton.o')`
`165`	`165`	`AC_CHECK_FUNC(strerror, AC_DEFINE(HAVE_STRERROR), STRERROR='strerror.o')`
`166`	`166`	`AC_CHECK_FUNC(strdup, AC_DEFINE(HAVE_STRDUP), STRDUP='../../utils/strdup.o')`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,9 @@`
`14`	`14`	`* The following is set using configure.`
`15`	`15`	`*/`
`16`	`16`
	`17`	`+/* Set to 1 if you have <crypt.h> */`
	`18`	`+#undef HAVE_CRYPT_H`
	`19`	`+`
`17`	`20`	`/* Set to 1 if you have <termios.h> */`
`18`	`21`	`#undef HAVE_TERMIOS_H`
`19`	`22`

Comments

(0)