Skip to content

Commit 212f7bd

Browse files
bmomjianbmomjian
committed
Patch to allow createuser options from the command line.
1 parent 99a099d commit 212f7bd

File tree

9 files changed

+106
-66
lines changed

9 files changed

+106
-66
lines changed

‎src/bin/createuser/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/createuser/Attic/Makefile,v 1.8 1998/04/06 16:49:37 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/createuser/Attic/Makefile,v 1.9 1998/08/22 05:19:16 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

1414
SRCDIR= ../..
1515
include ../../Makefile.global
1616

1717
SEDSCRIPT= \
18-
-e "s^_fUnKy_DASH_N_sTuFf_^$(DASH_N)^g" \
19-
-e "s^_fUnKy_BACKSLASH_C_sTuFf_^$(BACKSLASH_C)^g"
18+
-e "s^PG_OPT_DASH_N_PARAM^$(DASH_N)^g" \
19+
-e "s^PG_OPT_BACKSLASH_C_PARAM^$(BACKSLASH_C)^g"
2020

2121
all: createuser
2222

‎src/bin/createuser/createuser.sh

Lines changed: 55 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,16 @@
88
#
99
#
1010
# IDENTIFICATION
11-
# $Header: /cvsroot/pgsql/src/bin/createuser/Attic/createuser.sh,v 1.9 1998/02/25 13:08:37 scrappy Exp $
11+
# $Header: /cvsroot/pgsql/src/bin/createuser/Attic/createuser.sh,v 1.10 1998/08/22 05:19:17 momjian Exp $
1212
#
1313
# Note - this should NOT be setuid.
1414
#
1515
#-------------------------------------------------------------------------
1616

1717
CMDNAME=`basename $0`
18+
SYSID=
19+
CANADDUSER=
20+
CANCREATE=
1821

1922
if [ -z "$USER" ]; then
2023
if [ -z "$LOGNAME" ]; then
@@ -34,6 +37,11 @@ do
3437
-a) AUTHSYS=$2; shift;;
3538
-h) PGHOST=$2; shift;;
3639
-p) PGPORT=$2; shift;;
40+
-d) CANCREATE=t;;
41+
-D) CANCREATE=f;;
42+
-u) CANADDUSER=t;;
43+
-U) CANADDUSER=f;;
44+
-i) SYSID=$2; shift;;
3745
*) NEWUSER=$1;;
3846
esac
3947
shift;
@@ -96,7 +104,7 @@ fi
96104

97105
if [ -z "$NEWUSER" ]
98106
then
99-
echo _fUnKy_DASH_N_sTuFf_ "Enter name of user to add ---> _fUnKy_BACKSLASH_C_sTuFf_"
107+
echo PG_OPT_DASH_N_PARAM "Enter name of user to add ---> PG_OPT_BACKSLASH_C_PARAM"
100108
read NEWUSER
101109
fi
102110

@@ -124,7 +132,6 @@ done=0
124132

125133
while [ $done -ne 1 ]
126134
do
127-
SYSID=
128135
DEFSYSID=`pg_id $NEWUSER 2>/dev/null`
129136
if [ $? -eq 0 ]; then
130137
DEFMSG=" or RETURN to use unix user ID: $DEFSYSID"
@@ -134,31 +141,31 @@ do
134141
fi
135142
while [ -z "$SYSID" ]
136143
do
137-
echo _fUnKy_DASH_N_sTuFf_ "Enter user's postgres ID$DEFMSG -> _fUnKy_BACKSLASH_C_sTuFf_"
144+
echo PG_OPT_DASH_N_PARAM "Enter user's postgres ID$DEFMSG -> PG_OPT_BACKSLASH_C_PARAM"
138145
read SYSID
139146
[ -z "$SYSID" ] && SYSID=$DEFSYSID;
140147
SYSIDISNUM=`echo $SYSID | egrep '^[0-9]+$'`
141148
if [ -z "$SYSIDISNUM" ]
142149
then
143150
echo "$CMDNAME: the postgres ID must be a number"
144-
exit 1
145-
fi
146-
QUERY="select usename from pg_user where usesysid = '$SYSID'::int4"
147-
RES=`$PSQL -c "$QUERY" template1`
148-
if [ $? -ne 0 ]
149-
then
150-
echo "$CMDNAME: database access failed."
151-
exit 1
152-
fi
153-
if [ -n "$RES" ]
154-
then
155-
echo
156-
echo "$CMDNAME: $SYSID already belongs to $RES, pick another"
157-
DEFMSG= DEFSYSID= SYSID=
158-
else
159-
done=1
151+
SYSID=
160152
fi
161153
done
154+
QUERY="select usename from pg_user where usesysid = '$SYSID'::int4"
155+
RES=`$PSQL -c "$QUERY" template1`
156+
if [ $? -ne 0 ]
157+
then
158+
echo "$CMDNAME: database access failed."
159+
exit 1
160+
fi
161+
if [ -n "$RES" ]
162+
then
163+
echo
164+
echo "$CMDNAME: $SYSID already belongs to $RES, pick another"
165+
DEFMSG= DEFSYSID= SYSID=
166+
else
167+
done=1
168+
fi
162169
done
163170

164171
#
@@ -168,39 +175,44 @@ done
168175
#
169176
# can the user create databases?
170177
#
178+
if [ -z "$CANCREATE" ]
179+
then
180+
yn=f
171181

172-
yn=f
173-
174-
while [ "$yn" != y -a "$yn" != n ]
175-
do
176-
echo _fUnKy_DASH_N_sTuFf_ "Is user \"$NEWUSER\" allowed to create databases (y/n) _fUnKy_BACKSLASH_C_sTuFf_"
177-
read yn
178-
done
182+
while [ "$yn" != y -a "$yn" != n ]
183+
do
184+
echo PG_OPT_DASH_N_PARAM "Is user \"$NEWUSER\" allowed to create databases (y/n) PG_OPT_BACKSLASH_C_PARAM"
185+
read yn
186+
done
179187

180-
if [ "$yn" = y ]
181-
then
182-
CANCREATE=t
183-
else
184-
CANCREATE=f
188+
if [ "$yn" = y ]
189+
then
190+
CANCREATE=t
191+
else
192+
CANCREATE=f
193+
fi
185194
fi
186195

187196
#
188197
# can the user add users?
189198
#
190199

191-
yn=f
200+
if [ -z "$CANADDUSER" ]
201+
then
202+
yn=f
192203

193-
while [ "$yn" != y -a "$yn" != n ]
194-
do
195-
echo _fUnKy_DASH_N_sTuFf_ "Is user \"$NEWUSER\" allowed to add users? (y/n) _fUnKy_BACKSLASH_C_sTuFf_"
196-
read yn
197-
done
204+
while [ "$yn" != y -a "$yn" != n ]
205+
do
206+
echo PG_OPT_DASH_N_PARAM "Is user \"$NEWUSER\" allowed to add users? (y/n) PG_OPT_BACKSLASH_C_PARAM"
207+
read yn
208+
done
198209

199-
if (test "$yn" = y)
200-
then
201-
CANADDUSER=t
202-
else
203-
CANADDUSER=f
210+
if (test "$yn" = y)
211+
then
212+
CANADDUSER=t
213+
else
214+
CANADDUSER=f
215+
fi
204216
fi
205217

206218
QUERY="insert into pg_shadow \

‎src/bin/destroyuser/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/destroyuser/Attic/Makefile,v 1.8 1998/04/06 16:50:05 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/destroyuser/Attic/Makefile,v 1.9 1998/08/22 05:19:19 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

1414
SRCDIR= ../..
1515
include ../../Makefile.global
1616

1717
SEDSCRIPT= \
18-
-e "s^_fUnKy_DASH_N_sTuFf_^$(DASH_N)^g" \
19-
-e "s^_fUnKy_BACKSLASH_C_sTuFf_^$(BACKSLASH_C)^g"
18+
-e "s^PG_OPT_DASH_N_PARAM^$(DASH_N)^g" \
19+
-e "s^PG_OPT_BACKSLASH_C_PARAM^$(BACKSLASH_C)^g"
2020

2121
all: destroyuser
2222

‎src/bin/destroyuser/destroyuser.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#
99
#
1010
# IDENTIFICATION
11-
# $Header: /cvsroot/pgsql/src/bin/destroyuser/Attic/destroyuser.sh,v 1.8 1998/02/25 13:08:55 scrappy Exp $
11+
# $Header: /cvsroot/pgsql/src/bin/destroyuser/Attic/destroyuser.sh,v 1.9 1998/08/22 05:19:21 momjian Exp $
1212
#
1313
# Note - this should NOT be setuid.
1414
#
@@ -90,7 +90,7 @@ fi
9090

9191
if [ -z "$DELUSER" ]
9292
then
93-
echo _fUnKy_DASH_N_sTuFf_ "Enter name of user to delete ---> _fUnKy_BACKSLASH_C_sTuFf_"
93+
echo OPT_DASH_N_PARAM "Enter name of user to delete ---> OPT_BACKSLASH_C_PARAM"
9494
read DELUSER
9595
fi
9696

@@ -154,7 +154,7 @@ then
154154
yn=f
155155
while [ $yn != y -a $yn != n ]
156156
do
157-
echo _fUnKy_DASH_N_sTuFf_ "Deleting user $DELUSER will destroy them. Continue (y/n)? _fUnKy_BACKSLASH_C_sTuFf_"
157+
echo OPT_DASH_N_PARAM "Deleting user $DELUSER will destroy them. Continue (y/n)? OPT_BACKSLASH_C_PARAM"
158158
read yn
159159
done
160160

‎src/bin/initdb/initdb.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
#
2727
#
2828
# IDENTIFICATION
29-
# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.51 1998/08/21 23:22:36 momjian Exp $
29+
# $Header: /cvsroot/pgsql/src/bin/initdb/Attic/initdb.sh,v 1.52 1998/08/22 05:19:23 momjian Exp $
3030
#
3131
#-------------------------------------------------------------------------
3232

3333
# ----------------
34-
# The _fUnKy_..._sTuFf_ gets set when the script is built (with make)
34+
# The OPT_..._PARAM gets set when the script is built (with make)
3535
# from parameters set in the make file.
3636
#
3737
# ----------------

‎src/bin/initlocation/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/initlocation/Attic/Makefile,v 1.5 1998/04/06 16:50:30 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/initlocation/Attic/Makefile,v 1.6 1998/08/22 05:19:25 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

1414
SRCDIR= ../..
1515
include ../../Makefile.global
1616

1717
SEDSCRIPT= \
18-
-e "s^_fUnKy_NAMEDATALEN_sTuFf_^$(NAMEDATALEN)^g" \
19-
-e "s^_fUnKy_OIDNAMELEN_sTuFf_^$(OIDNAMELEN)^g"
18+
-e "s^PG_OPT_NAMEDATALEN_PARAM^$(NAMEDATALEN)^g" \
19+
-e "s^PG_OPT_OIDNAMELEN_PARAM^$(OIDNAMELEN)^g"
2020

2121
all: initlocation
2222

‎src/bin/ipcclean/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
#
88
#
99
# IDENTIFICATION
10-
# $Header: /cvsroot/pgsql/src/bin/ipcclean/Attic/Makefile,v 1.7 1998/04/06 16:50:36 momjian Exp $
10+
# $Header: /cvsroot/pgsql/src/bin/ipcclean/Attic/Makefile,v 1.8 1998/08/22 05:19:29 momjian Exp $
1111
#
1212
#-------------------------------------------------------------------------
1313

1414
SRCDIR= ../..
1515
include ../../Makefile.global
1616

1717
SEDSCRIPT= \
18-
-e "s^_fUnKy_IPCCLEANPATH_sTuFf_^$(IPCSDIR)^g"
18+
-e "s^PG_OPT_IPCCLEANPATH_PARAM^$(IPCSDIR)^g"
1919

2020
all: ipcclean
2121

‎src/bin/ipcclean/ipcclean.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/bin/sh
22
#
3-
# $Header: /cvsroot/pgsql/src/bin/ipcclean/Attic/ipcclean.sh,v 1.1.1.1 1996/07/09 06:22:13 scrappy Exp $
3+
# $Header: /cvsroot/pgsql/src/bin/ipcclean/Attic/ipcclean.sh,v 1.2 1998/08/22 05:19:31 momjian Exp $
44
#
5-
PATH=_fUnKy_IPCCLEANPATH_sTuFf_:$PATH
5+
PATH=PG_OPT_IPCCLEANPATH_PARAM:$PATH
66
export PATH
77
ipcs | egrep '^m .*|^s .*' | egrep "`whoami`|postgres" | \
88
awk '{printf "ipcrm -%s %s\n", $1, $2}' '-' | sh

‎src/man/createuser.1

Lines changed: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
.\" This is -*-nroff-*-
22
.\" XXX standard disclaimer belongs here....
3-
.\" $Header: /cvsroot/pgsql/src/man/Attic/createuser.1,v 1.11 1998/07/24 16:44:03 momjian Exp $
3+
.\" $Header: /cvsroot/pgsql/src/man/Attic/createuser.1,v 1.12 1998/08/22 05:19:35 momjian Exp $
44
.TH CREATEUSER UNIX 11/05/95 PostgreSQL PostgreSQL
55
.SH NAME
66
createuser - create a Postgres user
@@ -10,11 +10,26 @@ createuser - create a Postgres user
1010
.BR -a
1111
system]
1212
[\c
13+
.BR -d
14+
]
15+
[\c
16+
.BR -D
17+
]
18+
[\c
1319
.BR -h
1420
host]
1521
[\c
22+
.BR -i
23+
id]
24+
[\c
1625
.BR -p
1726
port]
27+
[\c
28+
.BR -u
29+
]
30+
[\c
31+
.BR -U
32+
]
1833
[username]
1934
.SH DESCRIPTION
2035
.IR Createuser
@@ -57,18 +72,35 @@ to use in connecting to the
5772
.IR postmaster
5873
process. This option no longer has any effect.
5974
.TP
75+
.BR "-d"
76+
Allows the user to create databases.
77+
.TP
78+
.BR "-D"
79+
Does not allow the user to create databases.
80+
.TP
6081
.BR "-h" " host"
6182
Specifies the hostname of the machine on which the
6283
.IR postmaster
6384
is running. Defaults to using local Unix domain sockets.
6485
.TP
86+
.BR "-i" " id"
87+
Use
88+
.IR id
89+
as the user id.
90+
.TP
6591
.BR "-p" " port"
6692
Specifies the TCP/IP port or local Unix domain socket file
6793
extension on which the
6894
.IR postmaster
6995
is listening for connections. Defaults to 5432, or the value of the
7096
.SM PGPORT
7197
environment variable (if set).
98+
.TP
99+
.BR "-u"
100+
Allows the user to create other users.
101+
.TP
102+
.BR "-U"
103+
Does not allow the user to create other users.
72104
.SH "INTERACTIVE QUESTIONS"
73105
Once invoked with the above options,
74106
.IR createuser
@@ -119,7 +151,3 @@ properly installed Postgres and initialized the site with
119151
.SH NOTE
120152
The command internally runs \fIcreate user\fP from \fIpsql\fP
121153
connected to the \fItemplate1\fP database to perform the operation.
122-
.SH BUGS
123-
Postgres user-ids and user names should not have anything to do
124-
with the constraints of Unix.
125-

0 commit comments

Comments
 (0)