Add checking for valid database encoding.

diff --git a/src/bin/initdb/initdb.sh b/src/bin/initdb/initdb.sh
index 4a23d7337a81698164dcc452a93540f3c2c15dfe..6e4032a92c71f5270003a65644b225960492480d 100644 (file)
--- a/src/bin/initdb/initdb.sh
+++ b/src/bin/initdb/initdb.sh
@@ -311,6 +311,10 @@ then
        then
                echo "$CMDNAME: $MULTIBYTE is not a valid encoding name" 1>&2
                exit 1
+       elif [ $MULTIBYTEID -gt 31 ]
+       then
+               echo "$CMDNAME: $MULTIBYTE cannot be used as a database encoding" 1>&2
+               exit 1
        fi
 fi
 

diff --git a/src/bin/scripts/createdb b/src/bin/scripts/createdb
index 9782ff6de5190f4805e3f289647573c4c3bae259..d10d2761f160e5ec0fe608df0c6ff8c9ca46d11c 100644 (file)
--- a/src/bin/scripts/createdb
+++ b/src/bin/scripts/createdb
@@ -145,6 +145,10 @@ then
        then
                echo "$CMDNAME: \"$MB\" is not a valid encoding name" 1>&2
                exit 1
+       elif [ $mbcode -gt 31 ]
+       then
+               echo "$CMDNAME: $MB cannot be used as a database encoding" 1>&2
+               exit 1
        fi
 fi