fix botched commit

diff --git a/src/mod/endpoints/mod_sofia/sofia_presence.c b/src/mod/endpoints/mod_sofia/sofia_presence.c
index d329989c0e3e374ea3f09747cfa0931cc1360d8e..ed33cede7d4279c99327f552f4ffdb0f7097560e 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia_presence.c
+++ b/src/mod/endpoints/mod_sofia/sofia_presence.c
@@ -3669,42 +3669,8 @@ void sofia_presence_handle_sip_i_subscribe(int status,
 
        switch_snprintf(exp_delta_str, sizeof(exp_delta_str), "%ld", exp_delta);
 
-       if (!strcmp("as-feature-event", event)) {
-               sip_authorization_t const *authorization = NULL;
-               auth_res_t auth_res = AUTH_FORBIDDEN;
-               char key[128] = "";
-               switch_event_t *v_event = NULL;
-
-
-               if (sip->sip_authorization) {
-                       authorization = sip->sip_authorization;
-               } else if (sip->sip_proxy_authorization) {
-                       authorization = sip->sip_proxy_authorization;
-               }
-
-               if (authorization) {
-                       char network_ip[80];
-                       sofia_glue_get_addr(de->data->e_msg, network_ip, sizeof(network_ip), NULL);
-                       auth_res = sofia_reg_parse_auth(profile, authorization, sip, de,
-                                                                                       (char *) sip->sip_request->rq_method_name, key, sizeof(key), network_ip, &v_event, 0,
-                                                                                       REG_REGISTER, to_user, NULL, NULL, NULL);
-               } else if ( sofia_reg_handle_register(nua, profile, nh, sip, de, REG_REGISTER, key, sizeof(key), &v_event, NULL, NULL, NULL)) {
-                       if (v_event) {
-                               switch_event_destroy(&v_event);
-                       }
-
-                       goto end;
-               }
-
-               if ((auth_res != AUTH_OK && auth_res != AUTH_RENEWED)) {
-                       nua_respond(nh, SIP_401_UNAUTHORIZED, NUTAG_WITH_THIS_MSG(de->data->e_msg), TAG_END());
-                       goto end;
-               }
-       }
-
        orig_to_user = su_strdup(nua_handle_home(nh), to_user);
 
->>>>>>> 8dccd21... FS-6085 --resolve
        if (to_user && strchr(to_user, '+')) {
                char *h;
                if ((proto = (d_user = strdup(to_user)))) {