diff options
| author | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-08-13 21:34:02 +0200 |
|---|---|---|
| committer | Stefan Schmidt <stefan@datenfreihafen.org> | 2009-08-13 21:34:02 +0200 |
| commit | 2c2ecdf61008a9e0cba4252e6aa5b98e0699df33 (patch) | |
| tree | c1c56c313977e1d436ebb25df891da8c8a25c2e7 /openbsc | |
| parent | aa665876c0275fec245d2c51aa9a960c7e98264e (diff) | |
| parent | bf0d5bde907b6e50949051cf4543ac8f8caa631c (diff) | |
Merge branch 'master' of git@192.168.100.10:openbsc
Diffstat (limited to 'openbsc')
| -rw-r--r-- | openbsc/src/gsm_04_08.c | 2 | ||||
| -rw-r--r-- | openbsc/src/token_auth.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/openbsc/src/gsm_04_08.c b/openbsc/src/gsm_04_08.c index 03fe01058..3e6c149ae 100644 --- a/openbsc/src/gsm_04_08.c +++ b/openbsc/src/gsm_04_08.c @@ -331,6 +331,8 @@ static int authorize_subscriber(struct gsm_loc_updating_operation *loc, case GSM_AUTH_POLICY_CLOSED: return subscriber->authorized; case GSM_AUTH_POLICY_TOKEN: + if (subscriber->authorized) + return subscriber->authorized; return (subscriber->flags & GSM_SUBSCRIBER_FIRST_CONTACT); case GSM_AUTH_POLICY_ACCEPT_ALL: return 1; diff --git a/openbsc/src/token_auth.c b/openbsc/src/token_auth.c index 6d4f14b2e..695b55243 100644 --- a/openbsc/src/token_auth.c +++ b/openbsc/src/token_auth.c @@ -30,8 +30,8 @@ #include <openbsc/chan_alloc.h> #include <openbsc/db.h> -#define TOKEN_SMS_TEXT "HAR 2009 GSM. Please visit http://har2009.gnumonks.org/ to" \ - "register. Your IMSI is %s, your auth token is %08X." +#define TOKEN_SMS_TEXT "HAR 2009 GSM. Register at http://har2009.gnumonks.org/ " \ + "Your IMSI is %s, auth token is %08X, phone no is %s." static char *build_sms_string(struct gsm_subscriber *subscr, u_int32_t token) { @@ -43,7 +43,8 @@ static char *build_sms_string(struct gsm_subscriber *subscr, u_int32_t token) if (!sms_str) return NULL; - snprintf(sms_str, len, TOKEN_SMS_TEXT, subscr->imsi, token); + snprintf(sms_str, len, TOKEN_SMS_TEXT, subscr->imsi, token, + subscr->extension); sms_str[len-1] = '\0'; return sms_str; |