Re: [PATCH v2 6/9] make conf_ugid() exit immediately after logging error

[Laine Stump <lstump@redhat.com>]

On 2/8/23 12:48 PM, Laine Stump wrote:
> Again, it can then be made to return void, simplifying the caller.
>
> Signed-off-by: Laine Stump <laine@redhat.com>
> ---
>   conf.c | 22 +++++++---------------
>   1 file changed, 7 insertions(+), 15 deletions(-)
>
> diff --git a/conf.c b/conf.c
> index 1e9c6f6..5e9a6f9 100644
> --- a/conf.c
> +++ b/conf.c
> @@ -998,10 +998,8 @@ static int conf_runas(char *opt, unsigned int *uid, unsigned int *gid)
>    * @runas:	--runas option, may be NULL
>    * @uid:	User ID, set on success
>    * @gid:	Group ID, set on success
> - *
> - * Return: 0 on success, negative error code on failure
>    */
> -static int conf_ugid(char *runas, uid_t *uid, gid_t *gid)
> +static void conf_ugid(char *runas, uid_t *uid, gid_t *gid)
>   {
>   	const char root_uid_map[] = "         0          0 4294967295";
>   	char buf[BUFSIZ];
> @@ -1012,8 +1010,7 @@ static int conf_ugid(char *runas, uid_t *uid, gid_t *gid)
>   	if (runas) {
>   		ret = conf_runas(runas, uid, gid);
>   		if (ret)
> -			err("Invalid --runas option: %s", runas);
> -		return ret;
> +			errexit("Invalid --runas option: %s", runas);


Noticed while reviewing my own patches in email - I was moving too 
quick/tired and counted the err() inside the "if (ret)" together with 
the subsequent return, when the return is actually outside of "if 
(ret)". I'll fix that up before reposting (along with your other 
suggestions).

>   	}
>   
>   	/* ...otherwise default to current user and group... */
> @@ -1022,20 +1019,18 @@ static int conf_ugid(char *runas, uid_t *uid, gid_t *gid)
>   
>   	/* ...as long as it's not root... */
>   	if (*uid)
> -		return 0;
> +		return;
>   
>   	/* ...or at least not root in the init namespace... */
>   	if ((fd = open("/proc/self/uid_map", O_RDONLY | O_CLOEXEC)) < 0) {
> -		ret = -errno;
> -		err("Can't determine if we're in init namespace: %s",
> -		    strerror(-ret));
> -		return ret;
> +		errexit("Can't determine if we're in init namespace: %s",
> +			strerror(-errno));
>   	}
>   
>   	if (read(fd, buf, BUFSIZ) != sizeof(root_uid_map) ||
>   	    strncmp(buf, root_uid_map, sizeof(root_uid_map) - 1)) {
>   		close(fd);
> -		return 0;
> +		return;
>   	}
>   
>   	close(fd);
> @@ -1059,7 +1054,6 @@ static int conf_ugid(char *runas, uid_t *uid, gid_t *gid)
>   		*uid = *gid = 65534;
>   #endif
>   	}
> -	return 0;
>   }
>   
>   /**
> @@ -1522,9 +1516,7 @@ void conf(struct ctx *c, int argc, char **argv)
>   	if (*c->sock_path && c->fd_tap >= 0)
>   		errexit("Options --socket and --fd are mutually exclusive");
>   
> -	ret = conf_ugid(runas, &uid, &gid);
> -	if (ret)
> -		usage(argv[0]);
> +	conf_ugid(runas, &uid, &gid);
>   
>   	if (logfile) {
>   		logfile_init(c->mode == MODE_PASST ? "passt" : "pasta",