commit adea4f1bf81b75111cf244607d15a05f7a419f40
author Sylvain Munaut <tnt@246tNt.com> Sat Jul 03 15:38:35 2010 +0200
committer Sylvain Munaut <tnt@246tNt.com> Sat Jul 03 22:24:13 2010 +0200
tree 8499d86bb4e73375b68eb982192aa24822f4b55f
parent c48ac4750dda4350d2e0a67b6ecbe3496b483f1a

db: Use proper %llu for subscriber ID in format string.

This was causing weird crashes when running in 32 bit linux.

Thanks to horiz0n for taking the time to debug this with me on IRC.

Written-by: horiz0n <cscan@gmx.net>
Signed-off-by: Sylvain Munaut <tnt@246tNt.com>

openbsc/src/db.c

diff --git a/openbsc/src/db.c b/openbsc/src/db.c
index 72e6bd3..124dfd7 100644
--- a/openbsc/src/db.c
+++ b/openbsc/src/db.c
@@ -355,7 +355,7 @@
 	const unsigned char *a3a8_ki;
 
 	result = dbi_conn_queryf(conn,
-			"SELECT * FROM AuthKeys WHERE subscriber_id=%u",
+			"SELECT * FROM AuthKeys WHERE subscriber_id=%llu",
 			 subscr->id);
 	if (!result)
 		return -EIO;
@@ -388,7 +388,7 @@
 	/* Deletion ? */
 	if (ainfo == NULL) {
 		result = dbi_conn_queryf(conn,
-			"DELETE FROM AuthKeys WHERE subscriber_id=%u",
+			"DELETE FROM AuthKeys WHERE subscriber_id=%llu",
 			subscr->id);
 
 		if (!result)
@@ -413,13 +413,13 @@
 		result = dbi_conn_queryf(conn,
 				"INSERT INTO AuthKeys "
 				"(subscriber_id, algorithm_id, a3a8_ki) "
-				"VALUES (%u, %u, %s)",
+				"VALUES (%llu, %u, %s)",
 				subscr->id, ainfo->auth_algo, ki_str);
 	} else {
 		result = dbi_conn_queryf(conn,
 				"UPDATE AuthKeys "
 				"SET algorithm_id=%u, a3a8_ki=%s "
-				"WHERE subscriber_id=%u",
+				"WHERE subscriber_id=%llu",
 				ainfo->auth_algo, ki_str, subscr->id);
 	}
 
@@ -441,7 +441,7 @@
 	const unsigned char *blob;
 
 	result = dbi_conn_queryf(conn,
-			"SELECT * FROM AuthLastTuples WHERE subscriber_id=%u",
+			"SELECT * FROM AuthLastTuples WHERE subscriber_id=%llu",
 			subscr->id);
 	if (!result)
 		return -EIO;
@@ -497,7 +497,7 @@
 	/* Deletion ? */
 	if (atuple == NULL) {
 		result = dbi_conn_queryf(conn,
-			"DELETE FROM AuthLastTuples WHERE subscriber_id=%u",
+			"DELETE FROM AuthLastTuples WHERE subscriber_id=%llu",
 			subscr->id);
 
 		if (!result)
@@ -527,7 +527,7 @@
 				"INSERT INTO AuthLastTuples "
 				"(subscriber_id, issued, use_count, "
 				 "key_seq, rand, sres, kc) "
-				"VALUES (%u, datetime('now'), %u, "
+				"VALUES (%llu, datetime('now'), %u, "
 				 "%u, %s, %s, %s ) ",
 				subscr->id, atuple->use_count, atuple->key_seq,
 				rand_str, sres_str, kc_str);
@@ -538,7 +538,7 @@
 				"UPDATE AuthLastTuples "
 				"SET issued=%s, use_count=%u, "
 				 "key_seq=%u, rand=%s, sres=%s, kc=%s "
-				"WHERE subscriber_id = %u",
+				"WHERE subscriber_id = %llu",
 				issued, atuple->use_count, atuple->key_seq,
 				rand_str, sres_str, kc_str, subscr->id);
 	}