Merge branch 'master' into libressl_seclevel0

.cirrus.yml

@@ -6,31 +6,58 @@ freebsd_12_task:
     image: freebsd-12-0-release-amd64
   install_script:
     - pkg install -y autoconf automake
-  build_script:
+  basic_script:
     - ./package/setup-configure
     - ./configure || { cat config.log; exit 1; }
     - make
-  test_script:
+    - make test
+  uds_script:
+    - ./package/setup-configure
+    - ./configure --with-trust-uds-cred --with-uds || { cat config.log; exit 1; }
+    - make
+    - make test
+  pam_ssl_script:
+    - ./package/setup-configure
+    - ./configure --with-pam --with-openssl || { cat config.log; exit 1; }
+    - make
     - make test
 
 linux_gcc_task:
   container:
     image: gcc:latest
-  build_script:
+  basic_script:
     - ./package/setup-configure
     - ./configure || { cat config.log; exit 1; }
     - make
-  test_script:
     - make test
-
-macos_task:
-  osx_instance:
-    image: mojave-xcode-10.1
-  install_script:
-    - brew install autoconf automake
-  build_script:
+  uds_script:
     - ./package/setup-configure
-    - ./configure || { cat config.log; exit 1; }
+    - ./configure --with-trust-uds-cred --with-uds || { cat config.log; exit 1; }
     - make
-  test_script:
     - make test
+  pam_ssl_script:
+    - ./package/setup-configure
+    - ./configure --with-pam --with-openssl || { cat config.log; exit 1; }
+    - make
+    - make test
+#
+#macos_task:
+#  osx_instance:
+#    image: mojave-xcode-10.1
+#  install_script:
+#    - brew install autoconf automake
+#  basic_script:
+#    - ./package/setup-configure
+#    - ./configure || { cat config.log; exit 1; }
+#    - make
+#    - make test
+#  uds_script:
+#    - ./package/setup-configure
+#    - ./configure --with-trust-uds-cred --with-uds || { cat config.log; exit 1; }
+#    - make
+#    - make test
+#  pam_ssl_script:
+#    - ./package/setup-configure
+#    - ./configure --with-pam --with-openssl || { cat config.log; exit 1; }
+#    - make
+#    - make test

conserver/main.c

@@ -1768,7 +1768,7 @@ main(int argc, char **argv)
 # if USE_IPV6
 			 config->primaryport,
 # elif USE_UNIX_DOMAIN_SOCKETS
-			 0,
+			 (unsigned short)0,
 # else
 			 bindPort,
 # endif

package/README.md

@@ -1,3 +1,9 @@
+Testing Locally
+---------------
+
+You can run `./package/make-and-stage-release local` and the current code will be
+packaged into `./build` so anyone can configure and build code in a confined space.
+
 Creating a new release
 ----------------------