ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-01-18 02:40:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

query fix & controller build fix

Browse Source
This commit is contained in:
Grant Limberg 2021-11-30 16:18:34 -08:00
parent 4a1d6f4cc8
commit d15516f0ef
No known key found for this signature in database
GPG Key ID: 2BA62CCABBB4095A
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
controller/PostgreSQL.cpp
View File

@ -392,7 +392,7 @@ AuthInfo PostgreSQL::getSSOAuthInfo(const nlohmann::json &member, const std::str
exit(6);
}
r = w.exec_params("SELECT org.client_id, org.authorization_endpoint, org.sso_version "
r = w.exec_params("SELECT org.client_id, org.authorization_endpoint, org.sso_impl_version "
"FROM ztc_network AS nw, ztc_org AS org "
"WHERE nw.id = $1 AND nw.sso_enabled = true AND org.owner_id = nw.owner_id", networkId);

2
ext/central-controller-docker/Dockerfile.run_base
View File

@ -2,4 +2,4 @@ FROM centos:8
RUN yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-8-x86_64/pgdg-redhat-repo-latest.noarch.rpm
RUN dnf -qy module disable postgresql
RUN yum -y install epel-release && yum -y update && yum clean all
RUN yum install -y jemalloc jemalloc-devel postgresql10 libpqxx && yum clean all
RUN yum install -y jemalloc jemalloc-devel postgresql10 libpqxx libpqxx-devel && yum clean all

4
service/OneService.cpp
View File

@ -251,7 +251,9 @@ public:
const char* nwid = Utils::hex(nwc->nwid, nwbuf);
fprintf(stderr, "NetworkState::setConfig(%s)\n", nwid);
memcpy(&_config, nwc, sizeof(ZT_VirtualNetworkConfig));
fprintf(stderr, "ssoEnabled: %s, ssoVersion: %d\n",
_config.ssoEnabled ? "true" : "false", _config.ssoVersion);
if (_config.ssoEnabled && _config.ssoVersion == 1) {
fprintf(stderr, "ssoEnabled for %s\n", nwid);
if (_idc == nullptr)