diff options
Diffstat (limited to 'xlators/protocol/auth/addr/src/addr.c')
| -rw-r--r-- | xlators/protocol/auth/addr/src/addr.c | 69 | 
1 files changed, 1 insertions, 68 deletions
diff --git a/xlators/protocol/auth/addr/src/addr.c b/xlators/protocol/auth/addr/src/addr.c index 6965da01b7a..1b4557134f9 100644 --- a/xlators/protocol/auth/addr/src/addr.c +++ b/xlators/protocol/auth/addr/src/addr.c @@ -30,21 +30,14 @@ gf_auth (dict_t *input_params, dict_t *config_params)          int            ret            = 0;          char          *name           = NULL;          char          *searchstr      = NULL; -        peer_info_t   *peer_info      = NULL; -        data_t        *peer_info_data = NULL;          data_t        *allow_addr     = NULL;          data_t        *reject_addr    = NULL;          char          *addr_str       = NULL;          char          *tmp            = NULL;          char          *addr_cpy       = NULL; -        char          *service        = NULL; -        uint16_t       peer_port      = 0; -        char           is_inet_sdp    = 0;          char           negate         = 0;          char           match          = 0;          char           peer_addr[UNIX_PATH_MAX]; -        char          *type           = NULL; -        gf_boolean_t   allow_insecure = _gf_false;          name = data_to_str (dict_get (input_params, "remote-subvolume"));          if (!name) { @@ -73,7 +66,7 @@ gf_auth (dict_t *input_params, dict_t *config_params)          GF_FREE (searchstr);          if (!allow_addr) { -                /* TODO: backword compatibility */ +                /* TODO: backward compatibility */                  ret = gf_asprintf (&searchstr, "auth.ip.%s.allow", name);                  if (-1 == ret) {                          gf_log ("auth/addr", GF_LOG_ERROR, @@ -92,66 +85,6 @@ gf_auth (dict_t *input_params, dict_t *config_params)                  goto out;          } -        peer_info_data = dict_get (input_params, "peer-info"); -        if (!peer_info_data) { -                gf_log ("auth/addr", GF_LOG_ERROR, -                        "peer-info not present"); -                goto out; -        } - -        peer_info = data_to_ptr (peer_info_data); - -        switch (((struct sockaddr *) &peer_info->sockaddr)->sa_family) -        { -        case AF_INET_SDP: -                is_inet_sdp = 1; -                ((struct sockaddr *) &peer_info->sockaddr)->sa_family = AF_INET; - -        case AF_INET: -        case AF_INET6: -        { -                strcpy (peer_addr, peer_info->identifier); -                service = strrchr (peer_addr, ':'); -                *service = '\0'; -                service ++; - -                if (is_inet_sdp) { -                        ((struct sockaddr *) &peer_info->sockaddr)->sa_family = AF_INET_SDP; -                } - -                ret = dict_get_str (config_params, "rpc-auth-allow-insecure", -                                    &type); -                if (ret == 0) { -                        ret = gf_string2boolean (type, &allow_insecure); -                        if (ret < 0) { -                                gf_log ("auth/addr", GF_LOG_WARNING, -                                        "rpc-auth-allow-insecure option %s " -                                        "is not a valid bool option", type); -                                goto out; -                        } -                } - -                peer_port = atoi (service); -                if (peer_port >= PRIVILEGED_PORT_CEILING && !allow_insecure) { -                        gf_log ("auth/addr", GF_LOG_ERROR, -                                "client is bound to port %d which is not privileged", -                                peer_port); -                        goto out; -                } -                break; - -        case AF_UNIX: -                strcpy (peer_addr, peer_info->identifier); -                break; - -        default: -                gf_log ("authenticate/addr", GF_LOG_ERROR, -                        "unknown address family %d", -                        ((struct sockaddr *) &peer_info->sockaddr)->sa_family); -                goto out; -        } -        } -          if (reject_addr) {                  addr_cpy = gf_strdup (reject_addr->data);                  if (!addr_cpy)  | 
