Print this page
first pass

*** 384,400 **** int i; mechanism_t *m; _sasl_global_context_t *gctx = ctx == NULL ? _sasl_gbl_ctx() : ctx; mech_list_t *mechlist = gctx->mechlist; - /* EXPORT DELETE START */ - /* CRYPT DELETE START */ #ifdef _INTEGRATED_SOLARIS_ int sun_reg; #endif /* _INTEGRATED_SOLARIS_ */ - /* CRYPT DELETE END */ - /* EXPORT DELETE END */ #else { #endif /* _SUN_SDK_ */ int plugcount; sasl_server_plug_t *pluglist; --- 384,396 ----
*** 427,443 **** /* call into the shared library asking for information about it */ /* version is filled in with the version of the plugin */ result = entry_point(mechlist->utils, SASL_SERVER_PLUG_VERSION, &version, &pluglist, &plugcount); - /* EXPORT DELETE START */ - /* CRYPT DELETE START */ #ifdef _INTEGRATED_SOLARIS_ sun_reg = _is_sun_reg(pluglist); #endif /* _INTEGRATED_SOLARIS_ */ - /* CRYPT DELETE END */ - /* EXPORT DELETE END */ #ifdef _SUN_SDK_ if (result != SASL_OK) { UNLOCK_MUTEX(&server_plug_mutex); __sasl_log(gctx, gctx->server_global_callbacks.callbacks, --- 423,435 ----
*** 511,527 **** sasl_FREE(mech); return SASL_NOMEM; } mech->version = version; #ifdef _SUN_SDK_ - /* EXPORT DELETE START */ - /* CRYPT DELETE START */ #ifdef _INTEGRATED_SOLARIS_ mech->sun_reg = sun_reg; #endif /* _INTEGRATED_SOLARIS_ */ - /* CRYPT DELETE END */ - /* EXPORT DELETE END */ /* whether this mech actually has any users in it's db */ mech->condition = SASL_OK; #else /* whether this mech actually has any users in it's db */ --- 503,515 ----
*** 1489,1530 **** if(!cur->context) return 0; break; } } - /* EXPORT DELETE START */ - /* CRYPT DELETE START */ #ifdef _INTEGRATED_SOLARIS_ if (!mech->sun_reg) { s_conn->sparams->props.min_ssf = 0; s_conn->sparams->props.max_ssf = 0; } s_conn->base.sun_reg = mech->sun_reg; #endif /* _INTEGRATED_SOLARIS_ */ - /* CRYPT DELETE END */ - /* EXPORT DELETE END */ if (conn->props.min_ssf < conn->external.ssf) { minssf = 0; } else { minssf = conn->props.min_ssf - conn->external.ssf; } /* Generic mechanism */ - /* EXPORT DELETE START */ - /* CRYPT DELETE START */ #ifdef _INTEGRATED_SOLARIS_ /* If not SUN supplied mech, it has no strength */ if (plug->max_ssf < minssf || (minssf > 0 && !mech->sun_reg)) { #else - /* CRYPT DELETE END */ - /* EXPORT DELETE END */ if (plug->max_ssf < minssf) { - /* EXPORT DELETE START */ - /* CRYPT DELETE START */ #endif /* _INTEGRATED_SOLARIS_ */ - /* CRYPT DELETE END */ - /* EXPORT DELETE END */ #ifdef _INTEGRATED_SOLARIS_ sasl_seterror(conn, SASL_NOLOG, gettext("mech %s is too weak"), plug->mech_name); #else sasl_seterror(conn, SASL_NOLOG, --- 1477,1506 ----
*** 1574,1597 **** cur->next = s_conn->mech_contexts; s_conn->mech_contexts = cur; } /* Generic mechanism */ - /* EXPORT DELETE START */ - /* CRYPT DELETE START */ #ifdef _INTEGRATED_SOLARIS_ /* If not SUN supplied mech, it has no strength */ if (plug->max_ssf < minssf || (minssf > 0 && !mech->sun_reg)) { #else - /* CRYPT DELETE END */ - /* EXPORT DELETE END */ if (plug->max_ssf < minssf) { - /* EXPORT DELETE START */ - /* CRYPT DELETE START */ #endif /* _INTEGRATED_SOLARIS_ */ - /* CRYPT DELETE END */ - /* EXPORT DELETE END */ #ifdef _INTEGRATED_SOLARIS_ sasl_seterror(conn, SASL_NOLOG, gettext("too weak")); #else sasl_seterror(conn, SASL_NOLOG, "too weak"); #endif /* _INTEGRATED_SOLARIS_ */ --- 1550,1565 ----