diff -Nru adcli-0.9.0/debian/changelog adcli-0.9.0/debian/changelog --- adcli-0.9.0/debian/changelog 2020-09-03 00:50:18.000000000 +1200 +++ adcli-0.9.0/debian/changelog 2020-11-10 16:03:47.000000000 +1300 @@ -1,3 +1,12 @@ +adcli (0.9.0-1ubuntu2) groovy; urgency=medium + + * Fixup "use-ldaps" option to add missing subcommands, as a part of + enabling support for new active directory requirement ADV190023 + (LP: #1868703): + - d/p/lp-1868703-01-tools-add-missing-use-ldaps-option-to-update-and-testjoin.patch + + -- Matthew Ruffell Tue, 10 Nov 2020 16:03:47 +1300 + adcli (0.9.0-1ubuntu1) groovy; urgency=medium * New features (LP: #1893784): diff -Nru adcli-0.9.0/debian/patches/lp-1868703-01-tools-add-missing-use-ldaps-option-to-update-and-testjoin.patch adcli-0.9.0/debian/patches/lp-1868703-01-tools-add-missing-use-ldaps-option-to-update-and-testjoin.patch --- adcli-0.9.0/debian/patches/lp-1868703-01-tools-add-missing-use-ldaps-option-to-update-and-testjoin.patch 1970-01-01 12:00:00.000000000 +1200 +++ adcli-0.9.0/debian/patches/lp-1868703-01-tools-add-missing-use-ldaps-option-to-update-and-testjoin.patch 2020-11-10 16:03:40.000000000 +1300 @@ -0,0 +1,27 @@ +Description: tools: add missing use-ldaps option to update and testjoin +Author: Sumit Bose +From: Matthew Ruffell +Origin: https://gitlab.freedesktop.org/realmd/adcli/-/commit/76ca1e6737742208d83e016d43a3379e378f8d90 +Bug: https://portal.msrc.microsoft.com/en-us/security-guidance/advisory/ADV190023 +Bug-Ubuntu: https://launchpad.net/bugs/1868703 + +Index: adcli-0.9.0/tools/computer.c +=================================================================== +--- adcli-0.9.0.orig/tools/computer.c 2020-11-10 16:03:37.545915941 +1300 ++++ adcli-0.9.0/tools/computer.c 2020-11-10 16:03:37.541915900 +1300 +@@ -491,6 +491,7 @@ + struct option options[] = { + { "domain", required_argument, NULL, opt_domain }, + { "domain-controller", required_argument, NULL, opt_domain_controller }, ++ { "use-ldaps", no_argument, 0, opt_use_ldaps }, + { "host-fqdn", required_argument, 0, opt_host_fqdn }, + { "computer-name", required_argument, 0, opt_computer_name }, + { "host-keytab", required_argument, 0, opt_host_keytab }, +@@ -612,6 +613,7 @@ + struct option options[] = { + { "domain", required_argument, NULL, opt_domain }, + { "domain-controller", required_argument, NULL, opt_domain_controller }, ++ { "use-ldaps", no_argument, 0, opt_use_ldaps }, + { "host-keytab", required_argument, 0, opt_host_keytab }, + { "verbose", no_argument, NULL, opt_verbose }, + { "help", no_argument, NULL, 'h' }, diff -Nru adcli-0.9.0/debian/patches/series adcli-0.9.0/debian/patches/series --- adcli-0.9.0/debian/patches/series 2020-09-03 00:50:03.000000000 +1200 +++ adcli-0.9.0/debian/patches/series 2020-11-10 16:03:35.000000000 +1300 @@ -9,3 +9,4 @@ discovery-fix.patch delete-do-not-exit-if-keytab-cannot-be-read.patch tools-disable-SSSD-s-locator-plugin.patch +lp-1868703-01-tools-add-missing-use-ldaps-option-to-update-and-testjoin.patch