Merge branch 'ondrej/enable-nolibtool-build-in-CI' into 'master'

Enable nolibtool build in CI

See merge request isc-projects/bind9!1953

.gitlab-ci.yml

@@ -476,3 +476,25 @@ unit:pkcs11:sid:amd64:
   <<: *unit_test_job
   dependencies:
     - pkcs11:sid:amd64
+
+# Jobs with libtool disabled
+
+nolibtool:sid:amd64:
+  variables:
+    CC: gcc
+    CFLAGS: "-Wall -Wextra -Og -g"
+    EXTRA_CONFIGURE: "--with-libidn2 --without-libtool --with-dlopen"
+  <<: *debian_sid_amd64_image
+  <<: *build_job
+
+system:nolibtool:sid:amd64:
+  <<: *debian_sid_amd64_image
+  <<: *system_test_job
+  dependencies:
+    - nolibtool:sid:amd64
+
+unit:nolibtool:sid:amd64:
+  <<: *debian_sid_amd64_image
+  <<: *unit_test_job
+  dependencies:
+    - nolibtool:sid:amd64

bin/named/main.c

@@ -338,7 +338,7 @@ save_command_line(int argc, char *argv[]) {
 	int i;
 	char *dst = saved_command_line;
 	char *eob = saved_command_line + sizeof(saved_command_line) - 1;
-	char *rollback;
+	char *rollback = dst;
 
 	for (i = 1; i < argc && dst < eob; i++) {
 		char *src = argv[i];

lib/dns/zone.c

@@ -15108,7 +15108,7 @@ static isc_result_t
 restore_nsec3param(dns_zone_t *zone, dns_db_t *db, dns_dbversion_t *version,
 		   nsec3paramlist_t *nsec3list)
 {
-	isc_result_t result;
+	isc_result_t result = ISC_R_SUCCESS;
 	dns_diff_t diff;
 	dns_rdata_t rdata;
 	nsec3param_t *nsec3p = NULL;