Commit4699d81

committed

Add ENCRYPTED/UNENCRYPTED control in createuser script.

1 parent0927d99 commit4699d81Copy full SHA for 4699d81

File tree

+31

-2

lines changed

+31

-2

lines changed

Lines changed: 21 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`<!--`
`2`		`-$Header: /cvsroot/pgsql/doc/src/sgml/ref/createuser.sgml,v 1.17 2001/05/02 14:46:33 momjian Exp $`
	`2`	`+$Header: /cvsroot/pgsql/doc/src/sgml/ref/createuser.sgml,v 1.18 2001/08/25 17:46:11 momjian Exp $`
`3`	`3`	`Postgres documentation`
`4`	`4`	`-->`
`5`	`5`
`@@ -132,6 +132,26 @@ Postgres documentation`
`132`	`132`	`</listitem>`
`133`	`133`	`</varlistentry>`
`134`	`134`
	`135`	`+ <varlistentry>`
	`136`	`+ <term>--encrypted</term>`
	`137`	`+ <listitem>`
	`138`	`+ <para>`
	`139`	`+Encrypts the user's password stored in the database. If not`
	`140`	`+specified, the default is used.`
	`141`	`+ </para>`
	`142`	`+ </listitem>`
	`143`	`+ </varlistentry>`
	`144`	`+`
	`145`	`+ <varlistentry>`
	`146`	`+ <term>--unencrypted</term>`
	`147`	`+ <listitem>`
	`148`	`+ <para>`
	`149`	`+Does not encrypt the user's password stored in the database. If`
	`150`	`+not specified, the default is used.`
	`151`	`+ </para>`
	`152`	`+ </listitem>`
	`153`	`+ </varlistentry>`
	`154`	`+`
`135`	`155`	`<varlistentry>`
`136`	`156`	`<term><replaceable class="parameter">username</replaceable></term>`
`137`	`157`	`<listitem>`

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`#`
`10`	`10`	`#`
`11`	`11`	`# IDENTIFICATION`
`12`		`-# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createuser,v 1.17 2001/02/18 18:34:01 momjian Exp $`
	`12`	`+# $Header: /cvsroot/pgsql/src/bin/scripts/Attic/createuser,v 1.18 2001/08/25 17:46:11 momjian Exp $`
`13`	`13`	`#`
`14`	`14`	`# Note - this should NOT be setuid.`
`15`	`15`	`#`
`@@ -25,6 +25,7 @@ CanCreateDb=`
`25`	`25`	`PwPrompt=`
`26`	`26`	`Password=`
`27`	`27`	`PSQLOPT=`
	`28`	`+Encrypted=# blank uses default`
`28`	`29`
`29`	`30`	`# Check for echo -n vs echo \c`
`30`	`31`
`@@ -103,6 +104,12 @@ do`
`103`	`104`	`--sysid=*)`
`104`	`105`	SysID=`echo"$1"\| sed's/^--sysid=//'`
`105`	`106`	`;;`
	`107`	`+ --encrypted)`
	`108`	`+Encrypted=t`
	`109`	`+;;`
	`110`	`+ --unencrypted)`
	`111`	`+Encrypted=f`
	`112`	`+;;`
`106`	`113`	`-i*)`
`107`	`114`	SysID=`echo"$1"\| sed's/^-i//'`
`108`	`115`	`;;`
`@@ -226,6 +233,8 @@ SUBQUERY=`
`226`	`233`	`["$CanCreateDb"= f ]&& QUERY="$QUERY NOCREATEDB"`
`227`	`234`	`["$CanAddUser"= t ]&& QUERY="$QUERY CREATEUSER"`
`228`	`235`	`["$CanAddUser"= f ]&& QUERY="$QUERY NOCREATEUSER"`
	`236`	`+["$Encrypted"= t ]&& QUERY="$QUERY ENCRYPTED"`
	`237`	`+["$Encrypted"= f ]&& QUERY="$QUERY UNENCRYPTED"`
`229`	`238`
`230`	`239`	`${PATHNAME}psql -c"$QUERY" -d template1$PSQLOPT`
`231`	`240`	`if [$?-ne 0 ];then`

Comments

(0)