tests: moved passwd files to data/

tests/Makefile.am

@@ -2,10 +2,10 @@ include ../src/common.mk
 
 EXTRA_DIST = certs/ca-key.pem certs/ca.pem common.sh certs/server-cert.pem \
 	certs/server-key.pem data/test1.config \
-	test1.passwd data/test-user-cert.config certs/user-cert.pem certs/user-key.pem \
+	data/test1.passwd data/test-user-cert.config certs/user-cert.pem certs/user-key.pem \
 	data/test3.config data/test-iroute.config \
 	user-config/test user-config-opt/test data/test-pass-script.config data/test-multi-cookie.config \
-	data/test-stress.config certs/user-cert-wrong.pem connect-script test-group.passwd \
+	data/test-stress.config certs/user-cert-wrong.pem connect-script data/test-group.passwd \
 	data/test-group-pass.config certs/user-group-cert.pem certs/user-group-key.pem \
 	data/test-user-group-cert.config \
 	data/test-user-group-cert-no-pass.config docker-common.sh data/test-cookie-timeout.config \

tests/data/test-ban.config

@@ -2,7 +2,7 @@
 # all should succeed.
 # Options: certificate, pam. 
 #auth = "certificate"
-auth = "plain[./test1.passwd]"
+auth = "plain[./data/test1.passwd]"
 #auth = "pam"
 
 # A banner to be displayed on clients

tests/data/test-cookie-invalidation.config

@@ -2,7 +2,7 @@
 # all should succeed.
 # Options: certificate, pam. 
 #auth = "certificate"
-auth = "plain[./test1.passwd]"
+auth = "plain[./data/test1.passwd]"
 #auth = "pam"
 
 # A banner to be displayed on clients

tests/data/test-cookie-timeout-2.config

@@ -2,7 +2,7 @@
 # all should succeed.
 # Options: certificate, pam. 
 #auth = "certificate"
-auth = "plain[./test1.passwd]"
+auth = "plain[./data/test1.passwd]"
 #auth = "pam"
 
 # A banner to be displayed on clients

tests/data/test-cookie-timeout.config

@@ -2,7 +2,7 @@
 # all should succeed.
 # Options: certificate, pam. 
 #auth = "certificate"
-auth = "plain[./test1.passwd]"
+auth = "plain[./data/test1.passwd]"
 #auth = "pam"
 
 # A banner to be displayed on clients

tests/data/test-enc-key.config

@@ -2,7 +2,7 @@
 # all should succeed.
 # Options: certificate, pam. 
 #auth = "certificate"
-auth = "plain[@SRCDIR@/test1.passwd]"
+auth = "plain[@SRCDIR@/data/test1.passwd]"
 #auth = "pam"
 
 # A banner to be displayed on clients

tests/data/test-enc-key2.config

@@ -2,7 +2,7 @@
 # all should succeed.
 # Options: certificate, pam. 
 #auth = "certificate"
-auth = "plain[@SRCDIR@/test1.passwd]"
+auth = "plain[@SRCDIR@/data/test1.passwd]"
 #auth = "pam"
 
 # A banner to be displayed on clients

tests/data/test-explicit-ip.config

@@ -2,7 +2,7 @@
 # all should succeed.
 # Options: certificate, pam. 
 #auth = "certificate[optional]"
-auth = "plain[./test1.passwd]"
+auth = "plain[./data/test1.passwd]"
 #auth = "pam"
 
 # A banner to be displayed on clients

tests/data/test-group-cert.config

@@ -2,7 +2,7 @@
 # all should succeed.
 # Options: certificate, pam. 
 auth = "certificate"
-#auth = "plain[./test-group.passwd]"
+#auth = "plain[./data/test-group.passwd]"
 #auth = "pam"
 
 select-group = group1

tests/data/test-group-pass.config

@@ -2,7 +2,7 @@
 # all should succeed.
 # Options: certificate, pam. 
 #auth = "certificate"
-auth = "plain[@SRCDIR@/test-group.passwd]"
+auth = "plain[@SRCDIR@/data/test-group.passwd]"
 #auth = "pam"
 
 # A banner to be displayed on clients

tests/data/test-gssapi-local-map.config

@@ -2,7 +2,7 @@
 # all should succeed.
 # Options: certificate, pam. 
 #auth = "certificate"
-#auth = "plain[./test1.passwd]"
+#auth = "plain[./data/test1.passwd]"
 auth = "gssapi"
 
 # A banner to be displayed on clients

tests/data/test-gssapi.config

@@ -2,7 +2,7 @@
 # all should succeed.
 # Options: certificate, pam. 
 #auth = "certificate"
-#auth = "plain[./test1.passwd]"
+#auth = "plain[./data/test1.passwd]"
 auth = "gssapi[require-local-user-map=false]"
 
 # A banner to be displayed on clients

tests/data/test-iroute.config

@@ -2,7 +2,7 @@
 # all should succeed.
 # Options: certificate, pam. 
 auth = "certificate"
-#auth = "plain[./test1.passwd]"
+#auth = "plain[./data/test1.passwd]"
 #auth = "pam"
 
 # A banner to be displayed on clients

tests/data/test-multi-cookie.config

@@ -2,7 +2,7 @@
 # all should succeed.
 # Options: certificate, pam. 
 #auth = "certificate"
-auth = "plain[./test1.passwd]"
+auth = "plain[./data/test1.passwd]"
 #auth = "pam"
 
 # A banner to be displayed on clients

tests/data/test-pass-opt-cert.config

@@ -2,7 +2,7 @@
 # all should succeed.
 # Options: certificate, pam. 
 enable-auth = "certificate"
-auth = "plain[./test1.passwd]"
+auth = "plain[./data/test1.passwd]"
 #auth = "pam"
 
 # A banner to be displayed on clients

tests/data/test-pass-script.config

@@ -2,7 +2,7 @@
 # all should succeed.
 # Options: certificate, pam. 
 #auth = "certificate"
-auth = "plain[./test1.passwd]"
+auth = "plain[./data/test1.passwd]"
 #auth = "pam"
 
 # A banner to be displayed on clients

tests/data/test-sighup-key-change.config

@@ -2,7 +2,7 @@
 # all should succeed.
 # Options: certificate, pam. 
 auth = "certificate"
-#auth = "plain[@SRCDIR@/test1.passwd]"
+#auth = "plain[@SRCDIR@/data/test1.passwd]"
 #auth = "pam"
 
 # A banner to be displayed on clients

tests/data/test-sighup.config

@@ -2,7 +2,7 @@
 # all should succeed.
 # Options: certificate, pam. 
 auth = "certificate"
-#auth = "plain[@SRCDIR@/test1.passwd]"
+#auth = "plain[@SRCDIR@/data/test1.passwd]"
 #auth = "pam"
 
 # A banner to be displayed on clients

tests/data/test-stress.config

@@ -2,7 +2,7 @@
 # all should succeed.
 # Options: certificate, pam. 
 #auth = "certificate"
-auth = "plain[./test1.passwd]"
+auth = "plain[./data/test1.passwd]"
 #auth = "pam"
 
 # A banner to be displayed on clients

tests/data/test-user-cert.config

@@ -2,7 +2,7 @@
 # all should succeed.
 # Options: certificate, pam. 
 auth = "certificate"
-auth = "plain[@SRCDIR@/test1.passwd]"
+auth = "plain[@SRCDIR@/data/test1.passwd]"
 #auth = "pam"
 
 # A banner to be displayed on clients

tests/data/test-user-config.config

@@ -2,7 +2,7 @@
 # all should succeed.
 # Options: certificate, pam. 
 auth = "certificate"
-#auth = "plain[./test1.passwd]"
+#auth = "plain[./data/test1.passwd]"
 #auth = "pam"
 
 # A banner to be displayed on clients

tests/data/test-user-group-cert-no-pass.config

@@ -2,7 +2,7 @@
 # all should succeed.
 # Options: certificate, pam. 
 auth = "certificate"
-#auth = "plain[@SRCDIR@/test-group.passwd]"
+#auth = "plain[@SRCDIR@/data/test-group.passwd]"
 #auth = "pam"
 
 select-group = group1

tests/data/test-user-group-cert.config

@@ -2,7 +2,7 @@
 # all should succeed.
 # Options: certificate, pam. 
 auth = "certificate"
-auth = "plain[@SRCDIR@/test-group.passwd]"
+auth = "plain[@SRCDIR@/data/test-group.passwd]"
 #auth = "pam"
 
 select-group = group1

tests/data/test1.config

@@ -2,7 +2,7 @@
 # all should succeed.
 # Options: certificate, pam. 
 #auth = "certificate"
-auth = "plain[@SRCDIR@/test1.passwd]"
+auth = "plain[@SRCDIR@/data/test1.passwd]"
 #auth = "pam"
 
 # A banner to be displayed on clients

tests/data/test3.config

@@ -2,7 +2,7 @@
 # all should succeed.
 # Options: certificate, pam. 
 auth = "certificate"
-#auth = "plain[@SRCDIR@/test1.passwd]"
+#auth = "plain[@SRCDIR@/data/test1.passwd]"
 #auth = "pam"
 
 # A banner to be displayed on clients

tests/test-sighup

@@ -50,7 +50,7 @@ echo -n "Connecting to obtain cookie (with certificate)... "
 echo ok
 
 sed -i 's/^auth = "certificate"/#auth = "certificate"/g' ${CONFIG}
-sed -i 's/^#auth = "plain[.\/test1.passwd]"/auth = "plain[.\/test1.passwd]"/g' ${CONFIG}
+sed -i 's|^#auth = "plain[.\/data/test1.passwd]"|auth = "plain[.\/data/test1.passwd]"|g' ${CONFIG}
 sleep 10
 echo "Reloading server"
 kill -HUP $PID