mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-07-20 14:19:37 +02:00
Don't use a temp file. It was created insecurely and was easy to do without.
This commit is contained in:
parent
f1423cd9fc
commit
aea3283cb4
@ -27,7 +27,7 @@
|
|||||||
# Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
|
# Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
|
||||||
# Portions Copyright (c) 1994, Regents of the University of California
|
# Portions Copyright (c) 1994, Regents of the University of California
|
||||||
#
|
#
|
||||||
# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.128 2001/06/22 19:16:23 wieck Exp $
|
# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.129 2001/06/23 23:29:48 petere Exp $
|
||||||
#
|
#
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
|
|
||||||
@ -45,8 +45,6 @@ exit_nicely(){
|
|||||||
echo "Removing $PGDATA." 1>&2
|
echo "Removing $PGDATA." 1>&2
|
||||||
rm -rf "$PGDATA" || echo "Failed." 1>&2
|
rm -rf "$PGDATA" || echo "Failed." 1>&2
|
||||||
fi
|
fi
|
||||||
echo "Removing temp file $TEMPFILE." 1>&2
|
|
||||||
rm -rf "$TEMPFILE" || echo "Failed." 1>&2
|
|
||||||
else
|
else
|
||||||
echo "Data directory $PGDATA will not be removed at user's request." 1>&2
|
echo "Data directory $PGDATA will not be removed at user's request." 1>&2
|
||||||
fi
|
fi
|
||||||
@ -65,12 +63,6 @@ datadir='@datadir@'
|
|||||||
# as set by configure --enable-multibyte[=XXX].
|
# as set by configure --enable-multibyte[=XXX].
|
||||||
MULTIBYTE='@MULTIBYTE@'
|
MULTIBYTE='@MULTIBYTE@'
|
||||||
|
|
||||||
if [ "$TMPDIR" ]; then
|
|
||||||
TEMPFILE="$TMPDIR/initdb.$$"
|
|
||||||
else
|
|
||||||
TEMPFILE="/tmp/initdb.$$"
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
# Check for echo -n vs echo \c
|
# Check for echo -n vs echo \c
|
||||||
if echo '\c' | grep -s c >/dev/null 2>&1
|
if echo '\c' | grep -s c >/dev/null 2>&1
|
||||||
@ -353,7 +345,7 @@ if [ "$show_setting" = yes ] || [ "$debug" = yes ]
|
|||||||
then
|
then
|
||||||
echo
|
echo
|
||||||
echo "Initdb variables:"
|
echo "Initdb variables:"
|
||||||
for var in PGDATA datadir PGPATH TEMPFILE MULTIBYTE MULTIBYTEID \
|
for var in PGDATA datadir PGPATH MULTIBYTE MULTIBYTEID \
|
||||||
POSTGRES_SUPERUSERNAME POSTGRES_SUPERUSERID POSTGRES_BKI \
|
POSTGRES_SUPERUSERNAME POSTGRES_SUPERUSERID POSTGRES_BKI \
|
||||||
POSTGRES_DESCR POSTGRESQL_CONF_SAMPLE \
|
POSTGRES_DESCR POSTGRESQL_CONF_SAMPLE \
|
||||||
PG_HBA_SAMPLE PG_IDENT_SAMPLE ; do
|
PG_HBA_SAMPLE PG_IDENT_SAMPLE ; do
|
||||||
@ -807,12 +799,11 @@ echo "CREATE VIEW pg_stat_database AS \
|
|||||||
| "$PGPATH"/postgres $PGSQL_OPT template1 > /dev/null || exit_nicely
|
| "$PGPATH"/postgres $PGSQL_OPT template1 > /dev/null || exit_nicely
|
||||||
|
|
||||||
echo "Loading pg_description."
|
echo "Loading pg_description."
|
||||||
echo "COPY pg_description FROM STDIN" > $TEMPFILE
|
(
|
||||||
cat "$POSTGRES_DESCR" >> $TEMPFILE
|
echo "COPY pg_description FROM STDIN;";
|
||||||
|
cat "$POSTGRES_DESCR"
|
||||||
cat $TEMPFILE \
|
) \
|
||||||
| "$PGPATH"/postgres $PGSQL_OPT template1 > /dev/null || exit_nicely
|
| "$PGPATH"/postgres $PGSQL_OPT template1 > /dev/null || exit_nicely
|
||||||
rm -f "$TEMPFILE" || exit_nicely
|
|
||||||
|
|
||||||
echo "Setting lastsysoid."
|
echo "Setting lastsysoid."
|
||||||
echo "UPDATE pg_database SET \
|
echo "UPDATE pg_database SET \
|
||||||
|
Loading…
Reference in New Issue
Block a user