Refactor the gssntlm_required_security function

Keeps manipulation of ctx->sec_req inside gss_ntlmssp.c

Signed-off-by: Simo Sorce <simo@redhat.com>

Author: simo5

src/gss_ntlmssp.c

@@ -39,7 +39,7 @@ const gss_OID_desc gssntlm_oid = {
     .elements = discard_const(GSS_NTLMSSP_OID_STRING)
 };
 
-uint8_t gssntlm_required_security(int security_level, struct gssntlm_ctx *ctx)
+bool gssntlm_required_security(int security_level, struct gssntlm_ctx *ctx)
 {
     uint8_t resp;
 
@@ -68,11 +68,11 @@ uint8_t gssntlm_required_security(int security_level, struct gssntlm_ctx *ctx)
         resp |= SEC_V2_OK | SEC_EXT_SEC_OK;
         break;
     default:
-        resp = 0xff;
-        break;
+        return false;
     }
 
-    return resp;
+    ctx->sec_req = resp;
+    return true;
 }
 
 void gssntlm_set_role(struct gssntlm_ctx *ctx,

src/gss_ntlmssp.h

@@ -161,7 +161,7 @@ static inline uint32_t gssntlmssp_ret_err(uint32_t *s, uint32_t n, uint32_t j)
     DEBUG_GSS_ERRORS((retmaj = (maj)), (retmin = (min))) ? 0 : \
      gssntlmssp_ret_err(minor_status, retmin, retmaj)
 
-uint8_t gssntlm_required_security(int security_level, struct gssntlm_ctx *ctx);
+bool gssntlm_required_security(int security_level, struct gssntlm_ctx *ctx);
 
 void gssntlm_set_role(struct gssntlm_ctx *ctx,
                       int desired, char *nb_domain_name);

src/gss_sec_ctx.c

@@ -195,8 +195,7 @@ uint32_t gssntlm_init_sec_context(uint32_t *minor_status,
         gssntlm_set_role(ctx, GSSNTLM_CLIENT, nb_domain_name);
 
         lm_compat_lvl = gssntlm_get_lm_compatibility_level();
-        ctx->sec_req = gssntlm_required_security(lm_compat_lvl, ctx);
-        if (ctx->sec_req == 0xff) {
+        if (!gssntlm_required_security(lm_compat_lvl, ctx)) {
             set_GSSERR(ERR_BADLMLVL);
             goto done;
         }
@@ -646,8 +645,7 @@ uint32_t gssntlm_accept_sec_context(uint32_t *minor_status,
         gssntlm_set_role(ctx, GSSNTLM_SERVER, nb_domain_name);
 
         lm_compat_lvl = gssntlm_get_lm_compatibility_level();
-        ctx->sec_req = gssntlm_required_security(lm_compat_lvl, ctx);
-        if (ctx->sec_req == 0xff) {
+        if (!gssntlm_required_security(lm_compat_lvl, ctx)) {
             set_GSSERR(ERR_BADLMLVL);
             goto done;
         }