Fix review comments: use bool, English comments, collapse else-if

diff --git a/scheduler/auth.c b/scheduler/auth.c
index 3cf111009fef4efd692247a3fe20216875040233..2f761c230959d2bef7d9e3773e06214389601b77 100644 (file)
--- a/scheduler/auth.c
+++ b/scheduler/auth.c
@@ -2001,7 +2001,7 @@ cupsdIsAuthorized(cupsd_client_t *con,    /* I - Connection */
 #endif /* HAVE_AUTHORIZATION_H */
 
       
-      int name_result = 0; // 0=not matched, 1=matched
+      bool name_result = false;
 
       
       for (name = (char *)cupsArrayFirst(best->names);
@@ -2009,23 +2009,23 @@ cupsdIsAuthorized(cupsd_client_t *con,  /* I - Connection */
            name = (char *)cupsArrayNext(best->names))
       {
         if (!_cups_strcasecmp(name, "@SYSTEM"))
-          continue; // baad mein check hoga
+          continue; // check @SYSTEM later
 
         if (!_cups_strcasecmp(name, "@OWNER") && owner &&
             ((pw && !strcmp(pw->pw_name, ownername)) ||
              (!pw && type == CUPSD_AUTH_NONE && !_cups_strcasecmp(username, ownername))))
         {
-          name_result = 1;
+          name_result = true;
         }
         else if (name[0] == '@')
         {
           if (cupsdCheckGroup(username, pw, name + 1))
-            name_result = 1;
+            name_result = true;
         }
         else if (pw && !strcmp(pw->pw_name, name))
-          name_result = 1;
+          name_result = true;
         else if (!pw && type == CUPSD_AUTH_NONE && !_cups_strcasecmp(username, name))
-          name_result = 1;
+          name_result = true;
       }
 
       // @SYSTEM check
@@ -2039,7 +2039,7 @@ cupsdIsAuthorized(cupsd_client_t *con,    /* I - Connection */
           {
             if (cupsdCheckGroup(username, pw, SystemGroups[i]) && check_admin_access(con))
             {
-              name_result = 1;
+              name_result = true;
               break;
             }
           }
@@ -2054,9 +2054,8 @@ cupsdIsAuthorized(cupsd_client_t *con,    /* I - Connection */
         else
           return (HTTP_STATUS_FORBIDDEN);
       }
-      else
+      else if (name_result)
       {
-        if (name_result)
           return (HTTP_STATUS_OK);
       }
     }