CVE-2020-25717 s3:passdb: use ID_TYPE_* instead of WBC_ID_TYPE_*

Currently these enums have the same values, but that will
change in future.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14539

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14556

(cherry picked from commit 58e9b62222ad62c81cdf11d704859a227cb2902b)

diff --git a/source3/passdb/lookup_sid.c b/source3/passdb/lookup_sid.c
index 4b3aa7e435dcffd5cf17eec45bdd4a5b77df86de..eb706c20e1bf1b13630eedf16fa381fa32bc3559 100644 (file)
--- a/source3/passdb/lookup_sid.c
+++ b/source3/passdb/lookup_sid.c
@@ -1418,14 +1418,14 @@ done:
         */
        for (i=0; i<num_sids; i++) {
                switch(ids[i].type) {
-               case WBC_ID_TYPE_GID:
-               case WBC_ID_TYPE_UID:
-               case WBC_ID_TYPE_BOTH:
+               case ID_TYPE_GID:
+               case ID_TYPE_UID:
+               case ID_TYPE_BOTH:
                        if (ids[i].id == (uint32_t)-1) {
                                ids[i].type = ID_TYPE_NOT_SPECIFIED;
                        }
                        break;
-               case WBC_ID_TYPE_NOT_SPECIFIED:
+               case ID_TYPE_NOT_SPECIFIED:
                        break;
                }
        }