DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

EAP-SIM DB: Return pseudonym username instead of structure with it

Browse source 
This cleans up the implemenation a bit.

Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2012-09-01 21:32:22 +03:00
parent 741596a817
commit e95ffe0465
1 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/eap_server/eap_sim_db.c
View file

@ -216,26 +216,23 @@ static int get_pseudonym_cb(void *ctx, int argc, char *argv[], char *col[])
} }
static struct eap_sim_pseudonym * static char *
db_get_pseudonym(struct eap_sim_db_data *data, const char *pseudonym) db_get_pseudonym(struct eap_sim_db_data *data, const char *pseudonym)
{ {
char cmd[128]; char cmd[128];
if (!valid_db_string(pseudonym)) if (!valid_db_string(pseudonym))
return NULL; return NULL;
os_memset(&data->db_tmp_pseudonym, 0, sizeof(data->db_tmp_pseudonym)); os_memset(&data->db_tmp_identity, 0, sizeof(data->db_tmp_identity));
os_strlcpy(data->db_tmp_pseudonym_str, pseudonym,
sizeof(data->db_tmp_pseudonym_str));
data->db_tmp_pseudonym.pseudonym = data->db_tmp_pseudonym_str;
os_snprintf(cmd, sizeof(cmd), os_snprintf(cmd, sizeof(cmd),
"SELECT permanent FROM pseudonyms WHERE pseudonym='%s';", "SELECT permanent FROM pseudonyms WHERE pseudonym='%s';",
pseudonym); pseudonym);
if (sqlite3_exec(data->sqlite_db, cmd, get_pseudonym_cb, data, NULL) != if (sqlite3_exec(data->sqlite_db, cmd, get_pseudonym_cb, data, NULL) !=
SQLITE_OK) SQLITE_OK)
return NULL; return NULL;
if (data->db_tmp_pseudonym.permanent == NULL) if (data->db_tmp_identity[0] == '\0')
return NULL; return NULL;
return &data->db_tmp_pseudonym; return data->db_tmp_identity;
} }
@ -945,7 +942,7 @@ int eap_sim_db_get_gsm_triplets(void *priv, const char *username, int max_chal,
} }
static struct eap_sim_pseudonym * static const char *
eap_sim_db_get_pseudonym(struct eap_sim_db_data *data, const char *pseudonym) eap_sim_db_get_pseudonym(struct eap_sim_db_data *data, const char *pseudonym)
{ {
struct eap_sim_pseudonym *p; struct eap_sim_pseudonym *p;
@ -963,7 +960,7 @@ eap_sim_db_get_pseudonym(struct eap_sim_db_data *data, const char *pseudonym)
p = data->pseudonyms; p = data->pseudonyms;
while (p) { while (p) {
if (os_strcmp(p->pseudonym, pseudonym) == 0) if (os_strcmp(p->pseudonym, pseudonym) == 0)
return p; return p->permanent;
p = p->next; p = p->next;
} }
@ -1274,16 +1271,11 @@ int eap_sim_db_add_reauth_prime(void *priv, const char *permanent,
const char * eap_sim_db_get_permanent(void *priv, const char *pseudonym) const char * eap_sim_db_get_permanent(void *priv, const char *pseudonym)
{ {
struct eap_sim_db_data *data = priv; struct eap_sim_db_data *data = priv;
struct eap_sim_pseudonym *p;
if (pseudonym == NULL) if (pseudonym == NULL)
return NULL; return NULL;
p = eap_sim_db_get_pseudonym(data, pseudonym); return eap_sim_db_get_pseudonym(data, pseudonym);
if (p == NULL)
return NULL;
return p->permanent;
} }