1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
https://bugs.gentoo.org/777423
--- a/src/plugins/libovh.c
+++ b/src/plugins/libovh.c
@@ -181,6 +181,7 @@
char *b64user;
char message[BUFLEN];
+ size_t pos, towrite;
if(strlen(args->login) > 128) {
ret_msg(NONE, "username is too long");
@@ -220,10 +221,18 @@
"\n--------------------------------------\n"
"%s--------------------------------------\n\n",
message);
-
- if(write(s, message, strlen(message)) == -1) {
- ret_msg(PERR, "write() failed");
- return RET_WARNING;
+
+ for (pos = 0, towrite = strlen(message); towrite > 0; ) {
+ ssize_t ret;
+
+ ret = write(s, message + pos, towrite - pos);
+ if(ret <= 0) {
+ ret_msg(PERR, "write() failed");
+ return RET_WARNING;
+ }
+
+ pos += ret;
+ towrite -= ret;
}
free(b64user);
@@ -236,13 +245,22 @@
{
int n;
- char server_msg[BUFSIZE], *ptr;
+ char server_msg[BUFLEN], *ptr;
/* get server_msg */
(void)memset(server_msg, 0, sizeof(server_msg));
- if(read(s, server_msg, sizeof(server_msg) - 1) < 0) {
- ret_msg(PERR, "read() failed");
- return RET_WARNING;
+
+ for (ptr = server_msg; ptr < &server_msg[BUFLEN]; ) {
+ ssize_t ret;
+
+ ret = read(s, ptr, &server_msg[BUFLEN] - ptr);
+ if (ret < 0) {
+ ret_msg(PERR, "read() failed");
+ return RET_WARNING;
+ } else if (ret == 0)
+ break;
+
+ ptr += ret;
}
print_debug("\n\nServer message:"
@@ -267,6 +285,7 @@
}
}
}
+ ret_msg(NONE, "unknown server response");
} else if(strstr(server_msg, "401 Authorization Required")) {
ret_msg(NONE, "wrong username or password");
} else {
|
