Turn enumeration into a boolean value

2 files changed, 4 insertions, 8 deletions

diff --git a/server/responder/nss/nsssrv.h b/server/responder/nss/nsssrv.h
index e9bae0f9..c5a7bb30 100644
--- a/server/responder/nss/nsssrv.h
+++ b/server/responder/nss/nsssrv.h
@@ -39,10 +39,6 @@
 
 #define NSS_PACKET_MAX_RECV_SIZE 1024
 
-#define NSS_ENUM_USERS 0x01
-#define NSS_ENUM_GROUPS 0x02
-#define NSS_ENUM_ALL 0x03
-
 #define NSS_SRV_CONFIG "config/services/nss"
 
 struct getent_ctx;
diff --git a/server/responder/nss/nsssrv_cmd.c b/server/responder/nss/nsssrv_cmd.c
index 30fbc15a..88749e9e 100644
--- a/server/responder/nss/nsssrv_cmd.c
+++ b/server/responder/nss/nsssrv_cmd.c
@@ -1022,7 +1022,7 @@ static void nss_cmd_setpwent_callback(void *ptr, int status,
 
     /* do not reply until all domain searches are done */
     for (dom = dctx->domain->next; dom; dom = dom->next) {
-        if ((dom->enumerate & NSS_ENUM_USERS) != 0) break;
+        if (dom->enumerate != 0) break;
     }
     dctx->domain = dom;
 
@@ -1150,7 +1150,7 @@ static int nss_cmd_setpwent_ext(struct cli_ctx *cctx, bool immediate)
 
     /* check if enumeration is enabled in any domain */
     for (dom = cctx->rctx->domains; dom; dom = dom->next) {
-        if ((dom->enumerate & NSS_ENUM_USERS) != 0) break;
+        if (dom->enumerate != 0) break;
     }
     dctx->domain = dom;
 
@@ -2350,7 +2350,7 @@ static void nss_cmd_setgrent_callback(void *ptr, int status,
 
     /* do not reply until all domain searches are done */
     for (dom = dctx->domain->next; dom; dom = dom->next) {
-        if ((dom->enumerate & NSS_ENUM_GROUPS) != 0) break;
+        if (dom->enumerate != 0) break;
     }
     dctx->domain = dom;
 
@@ -2478,7 +2478,7 @@ static int nss_cmd_setgrent_ext(struct cli_ctx *cctx, bool immediate)
 
     /* check if enumeration is enabled in any domain */
     for (dom = cctx->rctx->domains; dom; dom = dom->next) {
-        if ((dom->enumerate & NSS_ENUM_GROUPS) != 0) break;
+        if (dom->enumerate != 0) break;
     }
     dctx->domain = dom;