Skip to content

allow empty DOCKER_DOMAIN_SUFFIX #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rooterkyberian wants to merge 1 commit into
base: master
Choose a base branch
from
Open

allow empty DOCKER_DOMAIN_SUFFIX #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion m4/arg_with_define_string.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
AC_DEFUN([ACX_ARG_WITH_DEFINE_STRING], [
AC_MSG_CHECKING([$2])
AC_ARG_WITH([$1], [AS_HELP_STRING([--with-$1=$3], [$2])])
AS_VAR_IF(AS_TR_SH([with_$1]), [], [
AS_VAR_SET_IF(AS_TR_SH([with_$1]), [], [
AC_CACHE_VAL(AS_TR_SH([acx_cv_arg_with_$1]), [
AS_VAR_SET(AS_TR_SH([acx_cv_arg_with_$1]), [$3])])
AS_VAR_COPY(AS_TR_SH([with_$1]), AS_TR_SH([acx_cv_arg_with_$1]))])
Expand Down
28 changes: 15 additions & 13 deletions src/libnss_docker.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,6 @@ enum nss_status _nss_docker_gethostbyname3_r(
/* hostname is name without domain suffix */
char hostname[256];

/* docker domain suffix starts here */
char *hostname_suffix_ptr;

/* address of Docker API server */
struct sockaddr_un docker_api_addr;

Expand Down Expand Up @@ -162,18 +159,23 @@ enum nss_status _nss_docker_gethostbyname3_r(
strncpy(hostname, name, sizeof(hostname));
hostname[name_len] = '\0';

/* Handle only .docker domain */
if ((hostname_suffix_ptr = strstr(hostname, DOCKER_DOMAIN_SUFFIX)) == NULL) {
*errnop = EADDRNOTAVAIL;
goto return_unavail;
}
/* Handle only domains ending with DOCKER_DOMAIN_SUFFIX */
if (sizeof(DOCKER_DOMAIN_SUFFIX)) {
/* docker domain suffix starts here */
char *hostname_suffix_ptr = strstr(hostname, DOCKER_DOMAIN_SUFFIX);

if (hostname_suffix_ptr[sizeof(DOCKER_DOMAIN_SUFFIX) - 1] != '\0') {
*errnop = EADDRNOTAVAIL;
goto return_unavail;
}
if (hostname_suffix_ptr == NULL) {
*errnop = EADDRNOTAVAIL;
goto return_unavail;
}

*hostname_suffix_ptr = '\0';
if (hostname_suffix_ptr[sizeof(DOCKER_DOMAIN_SUFFIX) - 1] != '\0') {
*errnop = EADDRNOTAVAIL;
goto return_unavail;
}

*hostname_suffix_ptr = '\0';
}

/* Connect to Docker API socket */
memset((char *) &docker_api_addr, 0, sizeof(docker_api_addr));
Expand Down