testsuite: Throw error when AFP login fails

rdmark · rdmark · commit b9965163fd6d · 2024-10-17T18:12:30.000+02:00
diff --git a/test/testsuite/T2_spectest.c b/test/testsuite/T2_spectest.c
@@ -297,6 +297,7 @@ void usage( char * av0 )
 int main( int ac, char **av )
 {
 int cc;
+int ret;
 static char *vers = "AFPVersion 2.1";
 static char *uam = "Cleartxt Passwrd";
 
@@ -419,10 +420,14 @@ static char *uam = "Cleartxt Passwrd";
 
     /* login */	
     if (Version >= 30) {
-		FPopenLoginExt(Conn, vers, uam, User, Password);
+		ret = FPopenLoginExt(Conn, vers, uam, User, Password);
 	}
 	else {
-		FPopenLogin(Conn, vers, uam, User, Password);
+		ret = FPopenLogin(Conn, vers, uam, User, Password);
+	}
+	if (ret) {
+		printf("Login failed\n");
+		exit(1);
 	}
 	Conn->afp_version = Version;
 	
@@ -452,11 +457,15 @@ static char *uam = "Cleartxt Passwrd";
 		}
     	/* login */	
     	if (Version >= 30) {
-			FPopenLoginExt(Conn2, vers, uam, User2, Password);
+			ret = FPopenLoginExt(Conn2, vers, uam, User2, Password);
 		}
     	else {
-			FPopenLogin(Conn2, vers, uam, User2, Password);
+			ret = FPopenLogin(Conn2, vers, uam, User2, Password);
 		}
+	if (ret) {
+		printf("Login failed\n");
+		exit(1);
+	}
 		Conn2->afp_version = Version;
 	}
 	/*********************************
diff --git a/test/testsuite/afparg.c b/test/testsuite/afparg.c
@@ -244,6 +244,7 @@ char *uam = "Cleartxt Passwrd";
 int main( int ac, char **av )
 {
 int cc;
+int ret;
 
     while (( cc = getopt( ac, av, "v1234567h:p:s:u:w:f:l" )) != EOF ) {
         switch ( cc ) {
@@ -332,10 +333,14 @@ int cc;
 
     /* login */	
     if (Version >= 30) {
-		FPopenLoginExt(Conn, vers, uam, User, Password);
+		ret = FPopenLoginExt(Conn, vers, uam, User, Password);
 	}
 	else {
-		FPopenLogin(Conn, vers, uam, User, Password);
+		ret = FPopenLogin(Conn, vers, uam, User, Password);
+	}
+	if (ret) {
+		printf("Login failed\n");
+		exit(1);
 	}
 	Conn->afp_version = Version;
 	
diff --git a/test/testsuite/afpcli.c b/test/testsuite/afpcli.c
@@ -515,7 +515,6 @@ uint16_t len16;
 uint16_t temp16;
 int ofs;
 DSI *dsi;
-
 	dsi = &conn->dsi;
 
 	if (DSIOpenSession(conn)) {
diff --git a/test/testsuite/fail_spectest.c b/test/testsuite/fail_spectest.c
@@ -290,6 +290,7 @@ char *uam = "Cleartxt Passwrd";
 int main( int ac, char **av )
 {
 int cc;
+int ret;
 
     while (( cc = getopt( ac, av, "v1234567h:H:p:s:u:d:w:c:f:lmx" )) != EOF ) {
         switch ( cc ) {
@@ -401,10 +402,14 @@ int cc;
 
     /* login */	
     if (Version >= 30) {
-		FPopenLoginExt(Conn, vers, uam, User, Password);
+		ret = FPopenLoginExt(Conn, vers, uam, User, Password);
 	}
 	else {
-		FPopenLogin(Conn, vers, uam, User, Password);
+		ret = FPopenLogin(Conn, vers, uam, User, Password);
+	}
+	if (ret) {
+		printf("Login failed\n");
+		exit(1);
 	}
 	Conn->afp_version = Version;
 	
@@ -434,11 +439,15 @@ int cc;
 		}
     	/* login */	
     	if (Version >= 30) {
-			FPopenLoginExt(Conn2, vers, uam, User2, Password);
+			ret = FPopenLoginExt(Conn2, vers, uam, User2, Password);
 		}
     	else {
-			FPopenLogin(Conn2, vers, uam, User2, Password);
+			ret = FPopenLogin(Conn2, vers, uam, User2, Password);
 		}
+	if (ret) {
+		printf("Login failed\n");
+		exit(1);
+	}
 		Conn2->afp_version = Version;
 	}
 	/*********************************
diff --git a/test/testsuite/rotest.c b/test/testsuite/rotest.c
@@ -367,6 +367,7 @@ void usage( char * av0 )
 int main( int ac, char **av )
 {
 int cc;
+int ret;
 static char *uam = "Cleartxt Passwrd";
 
     while (( cc = getopt( ac, av, "v1234567h:p:u:w:ms:" )) != EOF ) {
@@ -440,10 +441,14 @@ static char *uam = "Cleartxt Passwrd";
 	/* ------------------------ */	
     connect_server();
     if (Version >= 30) {
-		FPopenLoginExt(Conn, vers, uam, User, Password);
+		ret = FPopenLoginExt(Conn, vers, uam, User, Password);
 	}
 	else {
-		FPopenLogin(Conn, vers, uam, User, Password);
+		ret = FPopenLogin(Conn, vers, uam, User, Password);
+	}
+	if (ret) {
+		printf("Login failed\n");
+		exit(1);
 	}
 	Conn->afp_version = Version;
 	run_all();
diff --git a/test/testsuite/sleeptest.c b/test/testsuite/sleeptest.c
@@ -195,6 +195,7 @@ char *uam = "Cleartxt Passwrd";
 int main( int ac, char **av )
 {
 int cc;
+int ret;
 
     while (( cc = getopt( ac, av, "v1234567ah:H:p:s:S:u:d:w:c:f:Llmxi" )) != EOF ) {
         switch ( cc ) {
@@ -319,10 +320,14 @@ int cc;
 
     /* login */	
     if (Version >= 30) {
-		FPopenLoginExt(Conn, vers, uam, User, Password);
+		ret = FPopenLoginExt(Conn, vers, uam, User, Password);
 	}
 	else {
-		FPopenLogin(Conn, vers, uam, User, Password);
+		ret = FPopenLogin(Conn, vers, uam, User, Password);
+	}
+	if (ret) {
+		printf("Login failed\n");
+		exit(1);
 	}
 	Conn->afp_version = Version;
 	
@@ -352,11 +357,15 @@ int cc;
 		}
     	/* login */	
     	if (Version >= 30) {
-			FPopenLoginExt(Conn2, vers, uam, User2, Password);
+			ret = FPopenLoginExt(Conn2, vers, uam, User2, Password);
 		}
     	else {
-			FPopenLogin(Conn2, vers, uam, User2, Password);
+			ret = FPopenLogin(Conn2, vers, uam, User2, Password);
 		}
+	if (ret) {
+		printf("Login failed\n");
+		exit(1);
+	}
 		Conn2->afp_version = Version;
 	}
 	/*********************************
diff --git a/test/testsuite/spectest.c b/test/testsuite/spectest.c
@@ -318,6 +318,7 @@ char *uam = "Cleartxt Passwrd";
 int main( int ac, char **av )
 {
 int cc;
+int ret;
 
     while (( cc = getopt( ac, av, "v1234567ah:H:p:s:S:u:d:w:c:f:Llmxi" )) != EOF ) {
         switch ( cc ) {
@@ -446,10 +447,14 @@ int cc;
 
     /* login */	
     if (Version >= 30) {
-		FPopenLoginExt(Conn, vers, uam, User, Password);
+		ret = FPopenLoginExt(Conn, vers, uam, User, Password);
 	}
 	else {
-		FPopenLogin(Conn, vers, uam, User, Password);
+		ret = FPopenLogin(Conn, vers, uam, User, Password);
+	}
+	if (ret) {
+		printf("Login failed\n");
+		exit(1);
 	}
 	Conn->afp_version = Version;
 	
@@ -479,11 +484,15 @@ int cc;
 		}
     	/* login */	
     	if (Version >= 30) {
-			FPopenLoginExt(Conn2, vers, uam, User2, Password);
+			ret = FPopenLoginExt(Conn2, vers, uam, User2, Password);
 		}
     	else {
-			FPopenLogin(Conn2, vers, uam, User2, Password);
+			ret = FPopenLogin(Conn2, vers, uam, User2, Password);
 		}
+	if (ret) {
+		printf("Login failed\n");
+		exit(1);
+	}
 		Conn2->afp_version = Version;
 	}
 	/*********************************

Original file line number	Diff line number	Diff line change
`@@ -297,6 +297,7 @@ void usage( char * av0 )`
`297`	`297`	`int main( int ac, char **av )`
`298`	`298`	`{`
`299`	`299`	`int cc;`
	`300`	`+int ret;`
`300`	`301`	`static char *vers = "AFPVersion 2.1";`
`301`	`302`	`static char *uam = "Cleartxt Passwrd";`
`302`	`303`
`@@ -419,10 +420,14 @@ static char *uam = "Cleartxt Passwrd";`
`419`	`420`
`420`	`421`	`/* login */`
`421`	`422`	`if (Version >= 30) {`
`422`		`- FPopenLoginExt(Conn, vers, uam, User, Password);`
	`423`	`+ ret = FPopenLoginExt(Conn, vers, uam, User, Password);`
`423`	`424`	`}`
`424`	`425`	`else {`
`425`		`- FPopenLogin(Conn, vers, uam, User, Password);`
	`426`	`+ ret = FPopenLogin(Conn, vers, uam, User, Password);`
	`427`	`+ }`
	`428`	`+ if (ret) {`
	`429`	`+ printf("Login failed\n");`
	`430`	`+ exit(1);`
`426`	`431`	`}`
`427`	`432`	`Conn->afp_version = Version;`
`428`	`433`
`@@ -452,11 +457,15 @@ static char *uam = "Cleartxt Passwrd";`
`452`	`457`	`}`
`453`	`458`	`/* login */`
`454`	`459`	`if (Version >= 30) {`
`455`		`- FPopenLoginExt(Conn2, vers, uam, User2, Password);`
	`460`	`+ ret = FPopenLoginExt(Conn2, vers, uam, User2, Password);`
`456`	`461`	`}`
`457`	`462`	`else {`
`458`		`- FPopenLogin(Conn2, vers, uam, User2, Password);`
	`463`	`+ ret = FPopenLogin(Conn2, vers, uam, User2, Password);`
`459`	`464`	`}`
	`465`	`+ if (ret) {`
	`466`	`+ printf("Login failed\n");`
	`467`	`+ exit(1);`
	`468`	`+ }`
`460`	`469`	`Conn2->afp_version = Version;`
`461`	`470`	`}`
`462`	`471`	`/*********************************`
Original file line number	Diff line number	Diff line change
`@@ -290,6 +290,7 @@ char *uam = "Cleartxt Passwrd";`
`290`	`290`	`int main( int ac, char **av )`
`291`	`291`	`{`
`292`	`292`	`int cc;`
	`293`	`+int ret;`
`293`	`294`
`294`	`295`	`while (( cc = getopt( ac, av, "v1234567h:H:p:s:u:d:w:c:f:lmx" )) != EOF ) {`
`295`	`296`	`switch ( cc ) {`
`@@ -401,10 +402,14 @@ int cc;`
`401`	`402`
`402`	`403`	`/* login */`
`403`	`404`	`if (Version >= 30) {`
`404`		`- FPopenLoginExt(Conn, vers, uam, User, Password);`
	`405`	`+ ret = FPopenLoginExt(Conn, vers, uam, User, Password);`
`405`	`406`	`}`
`406`	`407`	`else {`
`407`		`- FPopenLogin(Conn, vers, uam, User, Password);`
	`408`	`+ ret = FPopenLogin(Conn, vers, uam, User, Password);`
	`409`	`+ }`
	`410`	`+ if (ret) {`
	`411`	`+ printf("Login failed\n");`
	`412`	`+ exit(1);`
`408`	`413`	`}`
`409`	`414`	`Conn->afp_version = Version;`
`410`	`415`
`@@ -434,11 +439,15 @@ int cc;`
`434`	`439`	`}`
`435`	`440`	`/* login */`
`436`	`441`	`if (Version >= 30) {`
`437`		`- FPopenLoginExt(Conn2, vers, uam, User2, Password);`
	`442`	`+ ret = FPopenLoginExt(Conn2, vers, uam, User2, Password);`
`438`	`443`	`}`
`439`	`444`	`else {`
`440`		`- FPopenLogin(Conn2, vers, uam, User2, Password);`
	`445`	`+ ret = FPopenLogin(Conn2, vers, uam, User2, Password);`
`441`	`446`	`}`
	`447`	`+ if (ret) {`
	`448`	`+ printf("Login failed\n");`
	`449`	`+ exit(1);`
	`450`	`+ }`
`442`	`451`	`Conn2->afp_version = Version;`
`443`	`452`	`}`
`444`	`453`	`/*********************************`
Original file line number	Diff line number	Diff line change
`@@ -195,6 +195,7 @@ char *uam = "Cleartxt Passwrd";`
`195`	`195`	`int main( int ac, char **av )`
`196`	`196`	`{`
`197`	`197`	`int cc;`
	`198`	`+int ret;`
`198`	`199`
`199`	`200`	`while (( cc = getopt( ac, av, "v1234567ah:H:p:s:S:u:d:w:c:f:Llmxi" )) != EOF ) {`
`200`	`201`	`switch ( cc ) {`
`@@ -319,10 +320,14 @@ int cc;`
`319`	`320`
`320`	`321`	`/* login */`
`321`	`322`	`if (Version >= 30) {`
`322`		`- FPopenLoginExt(Conn, vers, uam, User, Password);`
	`323`	`+ ret = FPopenLoginExt(Conn, vers, uam, User, Password);`
`323`	`324`	`}`
`324`	`325`	`else {`
`325`		`- FPopenLogin(Conn, vers, uam, User, Password);`
	`326`	`+ ret = FPopenLogin(Conn, vers, uam, User, Password);`
	`327`	`+ }`
	`328`	`+ if (ret) {`
	`329`	`+ printf("Login failed\n");`
	`330`	`+ exit(1);`
`326`	`331`	`}`
`327`	`332`	`Conn->afp_version = Version;`
`328`	`333`
`@@ -352,11 +357,15 @@ int cc;`
`352`	`357`	`}`
`353`	`358`	`/* login */`
`354`	`359`	`if (Version >= 30) {`
`355`		`- FPopenLoginExt(Conn2, vers, uam, User2, Password);`
	`360`	`+ ret = FPopenLoginExt(Conn2, vers, uam, User2, Password);`
`356`	`361`	`}`
`357`	`362`	`else {`
`358`		`- FPopenLogin(Conn2, vers, uam, User2, Password);`
	`363`	`+ ret = FPopenLogin(Conn2, vers, uam, User2, Password);`
`359`	`364`	`}`
	`365`	`+ if (ret) {`
	`366`	`+ printf("Login failed\n");`
	`367`	`+ exit(1);`
	`368`	`+ }`
`360`	`369`	`Conn2->afp_version = Version;`
`361`	`370`	`}`
`362`	`371`	`/*********************************`
Original file line number	Diff line number	Diff line change
`@@ -318,6 +318,7 @@ char *uam = "Cleartxt Passwrd";`
`318`	`318`	`int main( int ac, char **av )`
`319`	`319`	`{`
`320`	`320`	`int cc;`
	`321`	`+int ret;`
`321`	`322`
`322`	`323`	`while (( cc = getopt( ac, av, "v1234567ah:H:p:s:S:u:d:w:c:f:Llmxi" )) != EOF ) {`
`323`	`324`	`switch ( cc ) {`
`@@ -446,10 +447,14 @@ int cc;`
`446`	`447`
`447`	`448`	`/* login */`
`448`	`449`	`if (Version >= 30) {`
`449`		`- FPopenLoginExt(Conn, vers, uam, User, Password);`
	`450`	`+ ret = FPopenLoginExt(Conn, vers, uam, User, Password);`
`450`	`451`	`}`
`451`	`452`	`else {`
`452`		`- FPopenLogin(Conn, vers, uam, User, Password);`
	`453`	`+ ret = FPopenLogin(Conn, vers, uam, User, Password);`
	`454`	`+ }`
	`455`	`+ if (ret) {`
	`456`	`+ printf("Login failed\n");`
	`457`	`+ exit(1);`
`453`	`458`	`}`
`454`	`459`	`Conn->afp_version = Version;`
`455`	`460`
`@@ -479,11 +484,15 @@ int cc;`
`479`	`484`	`}`
`480`	`485`	`/* login */`
`481`	`486`	`if (Version >= 30) {`
`482`		`- FPopenLoginExt(Conn2, vers, uam, User2, Password);`
	`487`	`+ ret = FPopenLoginExt(Conn2, vers, uam, User2, Password);`
`483`	`488`	`}`
`484`	`489`	`else {`
`485`		`- FPopenLogin(Conn2, vers, uam, User2, Password);`
	`490`	`+ ret = FPopenLogin(Conn2, vers, uam, User2, Password);`
`486`	`491`	`}`
	`492`	`+ if (ret) {`
	`493`	`+ printf("Login failed\n");`
	`494`	`+ exit(1);`
	`495`	`+ }`
`487`	`496`	`Conn2->afp_version = Version;`
`488`	`497`	`}`
`489`	`498`	`/*********************************`