From a347f96b99741e44276cdd481a72d04f1b2ac5fc Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Tue, 7 Feb 2012 14:55:34 +0200 Subject: createuser: Disable prompting by default Do not prompt when options were not specified. Assume --no-createdb, --no-createrole, --no-superuser by default. Also disable prompting for user name in dropdb, unless --interactive was specified. reviewed by Josh Kupershmidt --- src/bin/scripts/dropuser.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'src/bin/scripts/dropuser.c') diff --git a/src/bin/scripts/dropuser.c b/src/bin/scripts/dropuser.c index 2843b233f90..85b73a42ac2 100644 --- a/src/bin/scripts/dropuser.c +++ b/src/bin/scripts/dropuser.c @@ -106,7 +106,16 @@ main(int argc, char *argv[]) } if (dropuser == NULL) - dropuser = simple_prompt("Enter name of role to drop: ", 128, true); + { + if (interactive) + dropuser = simple_prompt("Enter name of role to drop: ", 128, true); + else + { + fprintf(stderr, _("%s: missing required argument role name\n"), progname); + fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname); + exit(1); + } + } if (interactive) { @@ -148,7 +157,8 @@ help(const char *progname) printf(_(" %s [OPTION]... [ROLENAME]\n"), progname); printf(_("\nOptions:\n")); printf(_(" -e, --echo show the commands being sent to the server\n")); - printf(_(" -i, --interactive prompt before deleting anything\n")); + printf(_(" -i, --interactive prompt before deleting anything, and prompt for\n" + " role name if not specified\n")); printf(_(" --if-exists don't report error if user doesn't exist\n")); printf(_(" --help show this help, then exit\n")); printf(_(" --version output version information, then exit\n")); -- cgit v1.2.3