X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=source4%2Flibrpc%2Fndr%2Fpy_misc.c;fp=source4%2Flibrpc%2Fndr%2Fpy_misc.c;h=2f66070d1bd50716b9c1f5de393da432dd125331;hb=4d65e3ad2104773b361afd35d3b8b8b7e598f91f;hp=2ee62ca7db49a5ae132da5a1bf3af03124a58047;hpb=a7633deb8978e2417430692223047283baf30147;p=samba.git

diff --git a/source4/librpc/ndr/py_misc.c b/source4/librpc/ndr/py_misc.c
index 2ee62ca7db4..2f66070d1bd 100644
--- a/source4/librpc/ndr/py_misc.c
+++ b/source4/librpc/ndr/py_misc.c
@@ -97,20 +97,19 @@ static int py_GUID_init(PyObject *self, PyObject *args, PyObject *kwargs)
 		DATA_BLOB guid_val;
 		Py_ssize_t _size;
 
-		if (!(PyUnicode_Check(str) || PyBytes_Check(str)) && !PyUnicode_Check(str)) {
-			PyErr_SetString(PyExc_TypeError, "Expected a string or bytes argument to GUID()");
-			return -1;
-		}
-
-		if (!PyBytes_Check(str)) {
+		if (PyUnicode_Check(str)) {
 			guid_val.data =
 				discard_const_p(uint8_t,
 						PyUnicode_AsUTF8AndSize(str, &_size));
-		} else {
+		} else if (PyBytes_Check(str)) {
 			guid_val.data =
 				discard_const_p(uint8_t,
 						PyBytes_AsString(str));
 			_size = PyBytes_Size(str);
+		} else {
+			PyErr_SetString(PyExc_TypeError,
+					"Expected a string or bytes argument to GUID()");
+			return -1;
 		}
 		guid_val.length = _size;
 		status = GUID_from_data_blob(&guid_val, guid);