From: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Date: Wed, 22 Jun 2022 03:21:31 +0000 (+1200)
Subject: pyglue:generate_random_[machine]_password: ValueError for bad values
X-Git-Tag: talloc-2.4.0~1294
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fa3f0499cc1709fefaf95a6a6902651ba3961c8d;p=thirdparty%2Fsamba.git

pyglue:generate_random_[machine]_password: ValueError for bad values

The actual range is 14 to 255 for machine passwords, and there is a
min <= max check for both.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andreas Schneider <asn@samba.org>

Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Fri Aug 26 08:59:28 UTC 2022 on sn-devel-184
---

diff --git a/python/pyglue.c b/python/pyglue.c
index dee3c296e03..60592874ae6 100644
--- a/python/pyglue.c
+++ b/python/pyglue.c
@@ -74,6 +74,11 @@ static PyObject *py_generate_random_password(PyObject *self, PyObject *args)
 
 	retstr = generate_random_password(NULL, min, max);
 	if (retstr == NULL) {
+		if (errno == EINVAL) {
+			PyErr_Format(PyExc_ValueError,
+				     "invalid range: %d - %d",
+				     min, max);
+		}
 		return NULL;
 	}
 	ret = PyUnicode_FromString(retstr);
@@ -104,6 +109,11 @@ static PyObject *py_generate_random_machine_password(PyObject *self, PyObject *a
 
 	retstr = generate_random_machine_password(NULL, min, max);
 	if (retstr == NULL) {
+		if (errno == EINVAL) {
+			PyErr_Format(PyExc_ValueError,
+				     "invalid range: %d - %d",
+				     min, max);
+		}
 		return NULL;
 	}
 	ret = PyUnicode_FromString(retstr);