Mercurial > dovecot > core-2.2
diff src/lib-master/master-login-auth.c @ 11086:260e190306b0 HEAD
Started using str_to_*() functions instead of libc's ones.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Wed, 07 Apr 2010 01:49:00 +0300 |
| parents | 2e08ce368bc0 |
| children | 0979e9e1e124 |
line wrap: on
line diff
--- a/src/lib-master/master-login-auth.c Wed Apr 07 01:48:03 2010 +0300 +++ b/src/lib-master/master-login-auth.c Wed Apr 07 01:49:00 2010 +0300 @@ -128,11 +128,11 @@ /* <id> <userid> [..] */ list = t_strsplit(args, "\t"); - if (list[0] == NULL || list[1] == NULL) { + if (list[0] == NULL || list[1] == NULL || + str_to_uint(list[0], &id) < 0) { i_error("Auth server sent corrupted USER line"); return FALSE; } - id = (unsigned int)strtoul(list[0], NULL, 10); request = master_login_auth_lookup_request(auth, id); if (request != NULL) { @@ -149,7 +149,11 @@ struct master_login_auth_request *request; unsigned int id; - id = (unsigned int)strtoul(args, NULL, 10); + if (str_to_uint(args, &id) < 0) { + i_error("Auth server sent corrupted NOTFOUND line"); + return FALSE; + } + request = master_login_auth_lookup_request(auth, id); if (request != NULL) { i_error("Authenticated user not found from userdb"); @@ -169,7 +173,7 @@ unsigned int i, id; args = t_strsplit(args_line, "\t"); - if (args[0] == NULL) { + if (args[0] == NULL || str_to_uint(args[0], &id) < 0) { i_error("Auth server sent broken FAIL line"); return FALSE; } @@ -178,7 +182,6 @@ error = args[i] + 7; } - id = (unsigned int)strtoul(args[0], NULL, 10); request = master_login_auth_lookup_request(auth, id); if (request != NULL) { if (error != NULL) @@ -217,8 +220,8 @@ /* make sure the major version matches */ if (strncmp(line, "VERSION\t", 8) != 0 || - atoi(t_strcut(line + 8, '\t')) != - AUTH_MASTER_PROTOCOL_MAJOR_VERSION) { + !str_uint_equals(t_strcut(line + 8, '\t'), + AUTH_MASTER_PROTOCOL_MAJOR_VERSION)) { i_error("Authentication server not compatible with " "master process (mixed old and new binaries?)"); master_login_auth_disconnect(auth);