Commitf637edc

committed

Merge branch 'pgmaster' into replica_twophase_II

2 parents525f714 +93513d1 commitf637edcCopy full SHA for f637edc

File tree

+1592

-880

lines changed

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

+1592

-880

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -15022,7 +15022,7 @@ fi`
`15022`	`15022`	`iftest"$enable_strong_random" ="yes"&&test x"$USE_OPENSSL_RANDOM" = x""&&test x"$USE_WIN32_RANDOM" = x""&&test x"$USE_DEV_URANDOM" = x"";then`
`15023`	`15023`	`iftest x"$with_openssl" = x"yes";then`
`15024`	`15024`	`USE_OPENSSL_RANDOM=1`
`15025`		`-eliftest"$PORTNAME" =x"win32";then`
	`15025`	`+eliftest"$PORTNAME" ="win32";then`
`15026`	`15026`	`USE_WIN32_RANDOM=1`
`15027`	`15027`	`else`
`15028`	`15028`	`{$as_echo"$as_me:${as_lineno-$LINENO}: checking for /dev/urandom">&5`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1981,7 +1981,7 @@ fi`
`1981`	`1981`	`if test "$enable_strong_random" = "yes" && test x"$USE_OPENSSL_RANDOM" = x"" && test x"$USE_WIN32_RANDOM" = x"" && test x"$USE_DEV_URANDOM" = x"" ; then`
`1982`	`1982`	`if test x"$with_openssl" = x"yes" ; then`
`1983`	`1983`	`USE_OPENSSL_RANDOM=1`
`1984`		`- elif test "$PORTNAME" =x"win32" ; then`
	`1984`	`+ elif test "$PORTNAME" = "win32" ; then`
`1985`	`1985`	`USE_WIN32_RANDOM=1`
`1986`	`1986`	`else`
`1987`	`1987`	`AC_CHECK_FILE([/dev/urandom], [], [])`

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`#endif`
`18`	`18`
`19`	`19`	`#include"fmgr.h"`
	`20`	`+#include"utils/backend_random.h"`
`20`	`21`	`#include"utils/builtins.h"`
`21`	`22`
`22`	`23`	`PG_MODULE_MAGIC;`
`@@ -77,8 +78,12 @@ chkpass_in(PG_FUNCTION_ARGS)`
`77`	`78`
`78`	`79`	`result= (chkpass*)palloc0(sizeof(chkpass));`
`79`	`80`
`80`		`-mysalt[0]=salt_chars[random()&0x3f];`
`81`		`-mysalt[1]=salt_chars[random()&0x3f];`
	`81`	`+if (!pg_backend_random(mysalt,2))`
	`82`	`+ereport(ERROR,`
	`83`	`+(errmsg("could not generate random salt")));`
	`84`	`+`
	`85`	`+mysalt[0]=salt_chars[mysalt[0]&0x3f];`
	`86`	`+mysalt[1]=salt_chars[mysalt[1]&0x3f];`
`82`	`87`	`mysalt[2]=0;/* technically the terminator is not necessary`
`83`	`88`	`* but I like to play safe */`
`84`	`89`

Comments

(0)