|
@@ -49,8 +49,6 @@ static void unit_stop(void)
|
|
|
|
|
|
UNITTEST_START
|
|
|
int result;
|
|
|
- bool login_changed;
|
|
|
- bool password_changed;
|
|
|
|
|
|
static const char * const filename1 = "log/netrc1304";
|
|
|
memcpy(filename, filename1, strlen(filename1));
|
|
@@ -59,7 +57,7 @@ UNITTEST_START
|
|
|
* Test a non existent host in our netrc file.
|
|
|
*/
|
|
|
result = Curl_parsenetrc("test.example.com", &login, &password,
|
|
|
- &login_changed, &password_changed, filename);
|
|
|
+ filename);
|
|
|
fail_unless(result == 1, "Host not found should return 1");
|
|
|
abort_unless(password != NULL, "returned NULL!");
|
|
|
fail_unless(password[0] == 0, "password should not have been changed");
|
|
@@ -73,15 +71,13 @@ UNITTEST_START
|
|
|
login = strdup("me");
|
|
|
abort_unless(login != NULL, "returned NULL!");
|
|
|
result = Curl_parsenetrc("example.com", &login, &password,
|
|
|
- &login_changed, &password_changed, filename);
|
|
|
+ filename);
|
|
|
fail_unless(result == 0, "Host should have been found");
|
|
|
abort_unless(password != NULL, "returned NULL!");
|
|
|
fail_unless(password[0] == 0, "password should not have been changed");
|
|
|
- fail_unless(!password_changed, "password should not have been changed");
|
|
|
abort_unless(login != NULL, "returned NULL!");
|
|
|
fail_unless(strncmp(login, "me", 2) == 0,
|
|
|
"login should not have been changed");
|
|
|
- fail_unless(!login_changed, "login should not have been changed");
|
|
|
|
|
|
/*
|
|
|
* Test a non existent login and host in our netrc file.
|
|
@@ -90,7 +86,7 @@ UNITTEST_START
|
|
|
login = strdup("me");
|
|
|
abort_unless(login != NULL, "returned NULL!");
|
|
|
result = Curl_parsenetrc("test.example.com", &login, &password,
|
|
|
- &login_changed, &password_changed, filename);
|
|
|
+ filename);
|
|
|
fail_unless(result == 1, "Host not found should return 1");
|
|
|
abort_unless(password != NULL, "returned NULL!");
|
|
|
fail_unless(password[0] == 0, "password should not have been changed");
|
|
@@ -106,15 +102,13 @@ UNITTEST_START
|
|
|
login = strdup("admi");
|
|
|
abort_unless(login != NULL, "returned NULL!");
|
|
|
result = Curl_parsenetrc("example.com", &login, &password,
|
|
|
- &login_changed, &password_changed, filename);
|
|
|
+ filename);
|
|
|
fail_unless(result == 0, "Host should have been found");
|
|
|
abort_unless(password != NULL, "returned NULL!");
|
|
|
fail_unless(password[0] == 0, "password should not have been changed");
|
|
|
- fail_unless(!password_changed, "password should not have been changed");
|
|
|
abort_unless(login != NULL, "returned NULL!");
|
|
|
fail_unless(strncmp(login, "admi", 4) == 0,
|
|
|
"login should not have been changed");
|
|
|
- fail_unless(!login_changed, "login should not have been changed");
|
|
|
|
|
|
/*
|
|
|
* Test a non existent login (superstring of an existing one)
|
|
@@ -124,15 +118,13 @@ UNITTEST_START
|
|
|
login = strdup("adminn");
|
|
|
abort_unless(login != NULL, "returned NULL!");
|
|
|
result = Curl_parsenetrc("example.com", &login, &password,
|
|
|
- &login_changed, &password_changed, filename);
|
|
|
+ filename);
|
|
|
fail_unless(result == 0, "Host should have been found");
|
|
|
abort_unless(password != NULL, "returned NULL!");
|
|
|
fail_unless(password[0] == 0, "password should not have been changed");
|
|
|
- fail_unless(!password_changed, "password should not have been changed");
|
|
|
abort_unless(login != NULL, "returned NULL!");
|
|
|
fail_unless(strncmp(login, "adminn", 6) == 0,
|
|
|
"login should not have been changed");
|
|
|
- fail_unless(!login_changed, "login should not have been changed");
|
|
|
|
|
|
/*
|
|
|
* Test for the first existing host in our netrc file
|
|
@@ -142,15 +134,13 @@ UNITTEST_START
|
|
|
login = strdup("");
|
|
|
abort_unless(login != NULL, "returned NULL!");
|
|
|
result = Curl_parsenetrc("example.com", &login, &password,
|
|
|
- &login_changed, &password_changed, filename);
|
|
|
+ filename);
|
|
|
fail_unless(result == 0, "Host should have been found");
|
|
|
abort_unless(password != NULL, "returned NULL!");
|
|
|
fail_unless(strncmp(password, "passwd", 6) == 0,
|
|
|
"password should be 'passwd'");
|
|
|
- fail_unless(password_changed, "password should have been changed");
|
|
|
abort_unless(login != NULL, "returned NULL!");
|
|
|
fail_unless(strncmp(login, "admin", 5) == 0, "login should be 'admin'");
|
|
|
- fail_unless(login_changed, "login should have been changed");
|
|
|
|
|
|
/*
|
|
|
* Test for the first existing host in our netrc file
|
|
@@ -159,16 +149,13 @@ UNITTEST_START
|
|
|
free(password);
|
|
|
password = strdup("");
|
|
|
abort_unless(password != NULL, "returned NULL!");
|
|
|
- result = Curl_parsenetrc("example.com", &login, &password,
|
|
|
- &login_changed, &password_changed, filename);
|
|
|
+ result = Curl_parsenetrc("example.com", &login, &password, filename);
|
|
|
fail_unless(result == 0, "Host should have been found");
|
|
|
abort_unless(password != NULL, "returned NULL!");
|
|
|
fail_unless(strncmp(password, "passwd", 6) == 0,
|
|
|
"password should be 'passwd'");
|
|
|
- fail_unless(password_changed, "password should have been changed");
|
|
|
abort_unless(login != NULL, "returned NULL!");
|
|
|
fail_unless(strncmp(login, "admin", 5) == 0, "login should be 'admin'");
|
|
|
- fail_unless(!login_changed, "login should not have been changed");
|
|
|
|
|
|
/*
|
|
|
* Test for the second existing host in our netrc file
|
|
@@ -181,15 +168,13 @@ UNITTEST_START
|
|
|
login = strdup("");
|
|
|
abort_unless(login != NULL, "returned NULL!");
|
|
|
result = Curl_parsenetrc("curl.example.com", &login, &password,
|
|
|
- &login_changed, &password_changed, filename);
|
|
|
+ filename);
|
|
|
fail_unless(result == 0, "Host should have been found");
|
|
|
abort_unless(password != NULL, "returned NULL!");
|
|
|
fail_unless(strncmp(password, "none", 4) == 0,
|
|
|
"password should be 'none'");
|
|
|
- fail_unless(password_changed, "password should have been changed");
|
|
|
abort_unless(login != NULL, "returned NULL!");
|
|
|
fail_unless(strncmp(login, "none", 4) == 0, "login should be 'none'");
|
|
|
- fail_unless(login_changed, "login should have been changed");
|
|
|
|
|
|
/*
|
|
|
* Test for the second existing host in our netrc file
|
|
@@ -199,14 +184,12 @@ UNITTEST_START
|
|
|
password = strdup("");
|
|
|
abort_unless(password != NULL, "returned NULL!");
|
|
|
result = Curl_parsenetrc("curl.example.com", &login, &password,
|
|
|
- &login_changed, &password_changed, filename);
|
|
|
+ filename);
|
|
|
fail_unless(result == 0, "Host should have been found");
|
|
|
abort_unless(password != NULL, "returned NULL!");
|
|
|
fail_unless(strncmp(password, "none", 4) == 0,
|
|
|
"password should be 'none'");
|
|
|
- fail_unless(password_changed, "password should have been changed");
|
|
|
abort_unless(login != NULL, "returned NULL!");
|
|
|
fail_unless(strncmp(login, "none", 4) == 0, "login should be 'none'");
|
|
|
- fail_unless(!login_changed, "login should not have been changed");
|
|
|
|
|
|
UNITTEST_STOP
|