Mailing-List: contact dev-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Received-SPF: pass (athena.apache.org: domain of ylavic.dev@gmail.com
 designates 209.85.223.169 as permitted sender)
MIME-Version: 1.0
In-Reply-To: <20140708094224.BC4F62388860@eris.apache.org>
References: <20140708094224.BC4F62388860@eris.apache.org>
Date: Tue, 8 Jul 2014 14:00:55 +0200
Message-ID: 
 <CAKQ1sVORsBWqyG3pf4etSktHhu_jmh6xr0U3_Byf4+jcAZBTFA@mail.gmail.com>
Subject: Re: svn commit: r1608703 - /httpd/httpd/trunk/server/listen.c
From: Yann Ylavic <ylavic.dev@gmail.com>
To: httpd <dev@httpd.apache.org>
Content-Type: text/plain; charset=UTF-8

On Tue, Jul 8, 2014 at 11:42 AM,  <jkaluza@apache.org> wrote:
>
> @@ -279,8 +279,35 @@ static apr_status_t close_listeners_on_e
>
>  #ifdef HAVE_SYSTEMD
>
> +static int find_systemd_socket(process_rec * process, apr_port_t port) {
> +    int fdcount, fd;
> +    int sdc = sd_listen_fds(0);
> +
> +    if (sdc < 0) {
> +        ap_log_perror(APLOG_MARK, APLOG_CRIT, sdc, process->pool, APLOGNO(02486)
> +                      "find_systemd_socket: Error parsing enviroment, sd_listen_fds returned %d",
> +                      sdc);
> +        return 1;
> +    }
> +
> +    if (sdc == 0) {
> +        ap_log_perror(APLOG_MARK, APLOG_CRIT, sdc, process->pool, APLOGNO(02487)
> +                      "find_systemd_socket: At least one socket must be set.");
> +        return 1;
> +    }

Shouldn't these returns be -1?