#include <freeradius-devel/ident.h>
RCSID("$Id$")
-#include <freeradius-devel/autoconf.h>
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-
-#ifdef HAVE_NETINET_IN_H
-# include <netinet/in.h>
-#endif
-
#include <freeradius-devel/radiusd.h>
#include <freeradius-devel/modules.h>
#include <freeradius-devel/rad_assert.h>
+#include <ctype.h>
+
/*
* Return a short string showing the terminal server, port
* and calling station ID.
*/
-char *auth_name(char *buf, size_t buflen, REQUEST *request, int do_cli) {
+char *auth_name(char *buf, size_t buflen, REQUEST *request, int do_cli)
+{
VALUE_PAIR *cli;
VALUE_PAIR *pair;
int port = 0;
- if ((cli = pairfind(request->packet->vps, PW_CALLING_STATION_ID)) == NULL)
+ if ((cli = pairfind(request->packet->vps, PW_CALLING_STATION_ID, 0)) == NULL)
do_cli = 0;
- if ((pair = pairfind(request->packet->vps, PW_NAS_PORT)) != NULL)
- port = pair->lvalue;
+ if ((pair = pairfind(request->packet->vps, PW_NAS_PORT, 0)) != NULL)
+ port = pair->vp_integer;
- snprintf(buf, buflen, "from client %.128s port %u%s%.128s",
- client_name_old(&request->packet->src_ipaddr), port,
- (do_cli ? " cli " : ""), (do_cli ? (char *)cli->vp_strvalue : ""));
+ snprintf(buf, buflen, "from client %.128s port %u%s%.128s%s",
+ request->client->shortname, port,
+ (do_cli ? " cli " : ""), (do_cli ? (char *)cli->vp_strvalue : ""),
+ (request->packet->dst_port == 0) ? " via TLS tunnel" : "");
return buf;
}
* Make sure user/pass are clean
* and then log them
*/
-static int rad_authlog(const char *msg, REQUEST *request, int goodpass) {
-
+static int rad_authlog(const char *msg, REQUEST *request, int goodpass)
+{
+ int logit;
+ const char *extra_msg = NULL;
char clean_password[1024];
char clean_username[1024];
char buf[1024];
+ char extra[1024];
VALUE_PAIR *username = NULL;
- if (!mainconfig.log_auth) {
+ if (!request->root->log_auth) {
return 0;
}
* Get the correct username based on the configured value
*/
if (log_stripped_names == 0) {
- username = pairfind(request->packet->vps, PW_USER_NAME);
+ username = pairfind(request->packet->vps, PW_USER_NAME, 0);
} else {
username = request->username;
}
if (username == NULL) {
strcpy(clean_username, "<no User-Name attribute>");
} else {
- librad_safeprint((char *)username->vp_strvalue,
+ fr_print_string((char *)username->vp_strvalue,
username->length,
clean_username, sizeof(clean_username));
}
/*
* Clean up the password
*/
- if (mainconfig.log_auth_badpass || mainconfig.log_auth_goodpass) {
+ if (request->root->log_auth_badpass || request->root->log_auth_goodpass) {
if (!request->password) {
VALUE_PAIR *auth_type;
auth_type = pairfind(request->config_items,
- PW_AUTH_TYPE);
+ PW_AUTH_TYPE, 0);
if (auth_type && (auth_type->vp_strvalue[0] != '\0')) {
snprintf(clean_password, sizeof(clean_password),
"<via Auth-Type = %s>",
} else {
strcpy(clean_password, "<no User-Password attribute>");
}
- } else if (pairfind(request->packet->vps, PW_CHAP_PASSWORD)) {
+ } else if (pairfind(request->packet->vps, PW_CHAP_PASSWORD, 0)) {
strcpy(clean_password, "<CHAP-Password>");
} else {
- librad_safeprint((char *)request->password->vp_strvalue,
+ fr_print_string((char *)request->password->vp_strvalue,
request->password->length,
clean_password, sizeof(clean_password));
}
}
if (goodpass) {
- radlog(L_AUTH, "%s: [%s%s%s] (%s)",
- msg,
- clean_username,
- mainconfig.log_auth_goodpass ? "/" : "",
- mainconfig.log_auth_goodpass ? clean_password : "",
- auth_name(buf, sizeof(buf), request, 1));
+ logit = request->root->log_auth_goodpass;
+ extra_msg = request->root->auth_goodpass_msg;
+ } else {
+ logit = request->root->log_auth_badpass;
+ extra_msg = request->root->auth_badpass_msg;
+ }
+
+ if (extra_msg) {
+ extra[0] = ' ';
+ radius_xlat(extra + 1, sizeof(extra) - 1, extra_msg, request,
+ NULL);
} else {
- radlog(L_AUTH, "%s: [%s%s%s] (%s)",
- msg,
- clean_username,
- mainconfig.log_auth_badpass ? "/" : "",
- mainconfig.log_auth_badpass ? clean_password : "",
- auth_name(buf, sizeof(buf), request, 1));
+ *extra = '\0';
}
+ radlog_request(L_AUTH, 0, request, "%s: [%s%s%s] (%s)%s",
+ msg,
+ clean_username,
+ logit ? "/" : "",
+ logit ? clean_password : "",
+ auth_name(buf, sizeof(buf), request, 1),
+ extra);
+
return 0;
}
VALUE_PAIR *cur_config_item;
VALUE_PAIR *password_pair;
VALUE_PAIR *auth_item;
- char string[MAX_STRING_LEN];
+ uint8_t my_chap[MAX_STRING_LEN];
int auth_type = -1;
int result;
int auth_type_count = 0;
* PW_AUTHTYPE_REJECT.
*/
cur_config_item = request->config_items;
- while(((auth_type_pair = pairfind(cur_config_item, PW_AUTH_TYPE))) != NULL) {
- auth_type = auth_type_pair->lvalue;
+ while(((auth_type_pair = pairfind(cur_config_item, PW_AUTH_TYPE, 0))) != NULL) {
+ DICT_VALUE *dv;
+ auth_type = auth_type_pair->vp_integer;
auth_type_count++;
+ dv = dict_valbyattr(auth_type_pair->attribute,
+ auth_type_pair->vp_integer, 0);
- DEBUG2(" rad_check_password: Found Auth-Type %s",
- auth_type_pair->vp_strvalue);
+ RDEBUG2("Found Auth-Type = %s",
+ (dv != NULL) ? dv->name : "?");
cur_config_item = auth_type_pair->next;
if (auth_type == PW_AUTHTYPE_REJECT) {
- DEBUG2(" rad_check_password: Auth-Type = Reject, rejecting user");
+ RDEBUG2("Auth-Type = Reject, rejecting user");
return -2;
}
}
if (( auth_type_count > 1) && (debug_flag)) {
- radlog(L_ERR, "Warning: Found %d auth-types on request for user '%s'",
+ radlog_request(L_ERR, 0, request, "Warning: Found %d auth-types on request for user '%s'",
auth_type_count, request->username->vp_strvalue);
}
* that means it is accepted and we do no further
* authentication
*/
- if ((auth_type == PW_AUTHTYPE_ACCEPT) || (request->proxy)) {
- DEBUG2(" rad_check_password: Auth-Type = Accept, accepting the user");
+ if ((auth_type == PW_AUTHTYPE_ACCEPT)
+#ifdef WITH_PROXY
+ || (request->proxy)
+#endif
+ ) {
+ RDEBUG2("Auth-Type = Accept, accepting the user");
return 0;
}
- password_pair = pairfind(request->config_items, PW_USER_PASSWORD);
+ password_pair = pairfind(request->config_items, PW_USER_PASSWORD, 0);
if (password_pair &&
- pairfind(request->config_items, PW_CLEARTEXT_PASSWORD)) {
- pairdelete(&request->config_items, PW_USER_PASSWORD);
+ pairfind(request->config_items, PW_CLEARTEXT_PASSWORD, 0)) {
+ pairdelete(&request->config_items, PW_USER_PASSWORD, 0);
password_pair = NULL;
}
if (password_pair) {
- DEBUG("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
- DEBUG("!!! Replacing User-Password in config items with Cleartext-Password. !!!");
- DEBUG("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
- DEBUG("!!! Please update your configuration so that the \"known good\" !!!");
- DEBUG("!!! clear text password is in Cleartext-Password, and not in User-Password. !!!");
- DEBUG("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+ DICT_ATTR *da;
+
+ RDEBUG("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+ RDEBUG("!!! Replacing User-Password in config items with Cleartext-Password. !!!");
+ RDEBUG("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+ RDEBUG("!!! Please update your configuration so that the \"known good\" !!!");
+ RDEBUG("!!! clear text password is in Cleartext-Password, and not in User-Password. !!!");
+ RDEBUG("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
password_pair->attribute = PW_CLEARTEXT_PASSWORD;
- strlcpy(password_pair->name, "Cleatext-Password",
- sizeof(password_pair->name));
+ da = dict_attrbyvalue(PW_CLEARTEXT_PASSWORD, 0);
+ if (!da) {
+ radlog_request(L_ERR, 0, request, "FATAL: You broke the dictionaries. Please use the default dictionaries!");
+ _exit(1);
+ }
+
+ password_pair->name = da->name;
}
/*
* FIXME: We should get rid of these hacks, and replace
* them with a module.
*/
- if ((password_pair = pairfind(request->config_items, PW_CRYPT_PASSWORD)) != NULL) {
+ if ((password_pair = pairfind(request->config_items, PW_CRYPT_PASSWORD, 0)) != NULL) {
/*
* Re-write Auth-Type, but ONLY if it isn't already
* set.
*/
if (auth_type == -1) auth_type = PW_AUTHTYPE_CRYPT;
} else {
- password_pair = pairfind(request->config_items, PW_CLEARTEXT_PASSWORD);
+ password_pair = pairfind(request->config_items, PW_CLEARTEXT_PASSWORD, 0);
}
if (auth_type < 0) {
*
* This is fail-safe.
*/
- DEBUG2("auth: No authenticate method (Auth-Type) configuration found for the request: Rejecting the user");
+ RDEBUG2("ERROR: No authenticate method (Auth-Type) found for the request: Rejecting the user");
return -2;
}
}
switch(auth_type) {
- DICT_VALUE *dval;
-
case PW_AUTHTYPE_CRYPT:
+ RDEBUG2("WARNING: Please update your configuration, and remove 'Auth-Type = Crypt'");
+ RDEBUG2("WARNING: Use the PAP module instead.");
+
/*
* Find the password sent by the user. It
* SHOULD be there, if it's not
*/
auth_item = request->password;
if (auth_item == NULL) {
- DEBUG2("auth: No User-Password or CHAP-Password attribute in the request");
+ RDEBUG2("No User-Password or CHAP-Password attribute in the request");
return -1;
}
- DEBUG2("auth: type Crypt");
if (password_pair == NULL) {
- DEBUG2("No Crypt-Password configured for the user");
+ RDEBUG2("No Crypt-Password configured for the user");
rad_authlog("Login incorrect "
"(No Crypt-Password configured for the user)", request, 0);
return -1;
}
- switch (lrad_crypt_check((char *)auth_item->vp_strvalue,
+ switch (fr_crypt_check((char *)auth_item->vp_strvalue,
(char *)password_pair->vp_strvalue)) {
case -1:
rad_authlog("Login incorrect "
}
break;
case PW_AUTHTYPE_LOCAL:
- DEBUG2("auth: type Local");
+ RDEBUG2("WARNING: Please update your configuration, and remove 'Auth-Type = Local'");
+ RDEBUG2("WARNING: Use the PAP or CHAP modules instead.");
/*
* Find the password sent by the user. It
* authentication fails.
*/
auth_item = request->password;
- if (!auth_item)
+ if (!auth_item)
auth_item = pairfind(request->packet->vps,
- PW_CHAP_PASSWORD);
+ PW_CHAP_PASSWORD, 0);
if (!auth_item) {
- DEBUG2("auth: No User-Password or CHAP-Password attribute in the request");
+ RDEBUG2("No User-Password or CHAP-Password attribute in the request.");
+ RDEBUG2("Cannot perform authentication.");
return -1;
}
* Plain text password.
*/
if (password_pair == NULL) {
- DEBUG2("auth: No password configured for the user");
+ RDEBUG2("No \"known good\" password was configured for the user.");
+ RDEBUG2("As a result, we cannot authenticate the user.");
rad_authlog("Login incorrect "
"(No password configured for the user)", request, 0);
return -1;
if (auth_item->attribute == PW_USER_PASSWORD) {
if (strcmp((char *)password_pair->vp_strvalue,
(char *)auth_item->vp_strvalue) != 0) {
- DEBUG2("auth: user supplied User-Password does NOT match local User-Password");
+ RDEBUG2("User-Password in the request does NOT match \"known good\" password.");
return -1;
}
- DEBUG2("auth: user supplied User-Password matches local User-Password");
+ RDEBUG2("User-Password in the request is correct.");
break;
} else if (auth_item->attribute != PW_CHAP_PASSWORD) {
- DEBUG2("The user did not supply a User-Password or a CHAP-Password attribute");
+ RDEBUG2("The user did not supply a User-Password or a CHAP-Password attribute");
rad_authlog("Login incorrect "
"(no User-Password or CHAP-Password attribute)", request, 0);
return -1;
}
- rad_chap_encode(request->packet, string,
- auth_item->vp_strvalue[0], password_pair);
+ rad_chap_encode(request->packet, my_chap,
+ auth_item->vp_octets[0], password_pair);
/*
* Compare them
*/
- if (memcmp(string + 1, auth_item->vp_strvalue + 1,
+ if (memcmp(my_chap + 1, auth_item->vp_strvalue + 1,
CHAP_VALUE_LENGTH) != 0) {
- DEBUG2("auth: user supplied CHAP-Password does NOT match local User-Password");
+ RDEBUG2("CHAP-Password is incorrect.");
return -1;
}
- DEBUG2("auth: user supplied CHAP-Password matches local User-Password");
+ RDEBUG2("CHAP-Password is correct.");
break;
default:
- dval = dict_valbyattr(PW_AUTH_TYPE, auth_type);
- if (dval) {
- DEBUG2("auth: type \"%s\"", dval->name);
- } else {
- DEBUG2("auth: type UNKNOWN-%d", auth_type);
- }
-
/*
* See if there is a module that handles
* this type, and turn the RLM_ return
/*
* Do post-authentication calls. ignoring the return code.
*/
- vp = pairfind(request->config_items, PW_POST_AUTH_TYPE);
+ vp = pairfind(request->config_items, PW_POST_AUTH_TYPE, 0);
if (vp) {
- DEBUG2(" Found Post-Auth-Type %s", vp->vp_strvalue);
- postauth_type = vp->lvalue;
+ RDEBUG2("Using Post-Auth-Type %s", vp->vp_strvalue);
+ postauth_type = vp->vp_integer;
}
result = module_post_auth(postauth_type, request);
switch (result) {
}
/*
- * Before sending an Access-Reject, call the modules in the
- * Post-Auth-Type REJECT stanza.
- */
-static int rad_postauth_reject(REQUEST *request)
-{
- int result;
- VALUE_PAIR *tmp;
- DICT_VALUE *dval;
-
- dval = dict_valbyname(PW_POST_AUTH_TYPE, "REJECT");
- if (dval) {
- /* Overwrite the Post-Auth-Type with the value REJECT */
- pairdelete(&request->config_items, PW_POST_AUTH_TYPE);
- tmp = paircreate(PW_POST_AUTH_TYPE, PW_TYPE_INTEGER);
- tmp->lvalue = dval->value;
- pairadd(&request->config_items, tmp);
- result = rad_postauth(request);
- } else {
- /* No REJECT stanza */
- result = RLM_MODULE_OK;
- }
- return result;
-}
-
-/*
* Process and reply to an authentication request
*
* The return value of this function isn't actually used right now, so
int rad_authenticate(REQUEST *request)
{
VALUE_PAIR *namepair;
+#ifdef WITH_SESSION_MGMT
VALUE_PAIR *check_item;
- VALUE_PAIR *auth_item;
+#endif
+ VALUE_PAIR *auth_item = NULL;
VALUE_PAIR *module_msg;
VALUE_PAIR *tmp = NULL;
int result;
- char umsg[MAX_STRING_LEN + 1];
- const char *user_msg = NULL;
const char *password;
- char logstr[1024];
char autz_retry = 0;
int autz_type = 0;
password = "";
+#ifdef WITH_PROXY
/*
* If this request got proxied to another server, we need
* to check whether it authenticated the request or not.
* accordingly.
*/
case PW_AUTHENTICATION_ACK:
- tmp = paircreate(PW_AUTH_TYPE, PW_TYPE_INTEGER);
- if (tmp == NULL) {
- radlog(L_ERR|L_CONS, "Not enough memory");
- exit(1);
- }
- tmp->lvalue = PW_AUTHTYPE_ACCEPT;
- pairadd(&request->config_items, tmp);
- break;
+ tmp = radius_paircreate(request,
+ &request->config_items,
+ PW_AUTH_TYPE, 0, PW_TYPE_INTEGER);
+ if (tmp) tmp->vp_integer = PW_AUTHTYPE_ACCEPT;
+ goto authenticate;
+
/*
* Challenges are punted back to the NAS without any
* further processing.
* done by the server, by rejecting them here.
*/
case PW_AUTHENTICATION_REJECT:
- default:
rad_authlog("Login incorrect (Home Server says so)",
request, 0);
request->reply->code = PW_AUTHENTICATION_REJECT;
- rad_postauth_reject(request);
+ return RLM_MODULE_REJECT;
+
+ default:
+ rad_authlog("Login incorrect (Home Server failed to respond)",
+ request, 0);
return RLM_MODULE_REJECT;
}
}
+#endif
/*
* Get the username from the request.
*/
if (!request->password) {
request->password = pairfind(request->packet->vps,
- PW_USER_PASSWORD);
+ PW_USER_PASSWORD, 0);
}
/*
* Maybe there's a CHAP-Password?
*/
if ((auth_item = pairfind(request->packet->vps,
- PW_CHAP_PASSWORD)) != NULL) {
+ PW_CHAP_PASSWORD, 0)) != NULL) {
password = "<CHAP-PASSWORD>";
} else {
case RLM_MODULE_OK:
case RLM_MODULE_UPDATED:
break;
- case RLM_MODULE_FAIL:
case RLM_MODULE_HANDLED:
return result;
+ case RLM_MODULE_FAIL:
case RLM_MODULE_INVALID:
case RLM_MODULE_REJECT:
case RLM_MODULE_USERLOCK:
default:
if ((module_msg = pairfind(request->packet->vps,
- PW_MODULE_FAILURE_MESSAGE)) != NULL) {
+ PW_MODULE_FAILURE_MESSAGE, 0)) != NULL) {
char msg[MAX_STRING_LEN + 16];
snprintf(msg, sizeof(msg), "Invalid user (%s)",
module_msg->vp_strvalue);
return result;
}
if (!autz_retry) {
- tmp = pairfind(request->config_items, PW_AUTZ_TYPE);
+ tmp = pairfind(request->config_items, PW_AUTZ_TYPE, 0);
if (tmp) {
- DEBUG2(" Found Autz-Type %s", tmp->vp_strvalue);
- autz_type = tmp->lvalue;
+ RDEBUG2("Using Autz-Type %s", tmp->vp_strvalue);
+ autz_type = tmp->vp_integer;
autz_retry = 1;
goto autz_redo;
}
* modules has decided that a proxy should be used. If
* so, get out of here and send the packet.
*/
- if ((request->proxy == NULL) &&
- ((tmp = pairfind(request->config_items, PW_PROXY_TO_REALM)) != NULL)) {
+ if (
+#ifdef WITH_PROXY
+ (request->proxy == NULL) &&
+#endif
+ ((tmp = pairfind(request->config_items, PW_PROXY_TO_REALM, 0)) != NULL)) {
REALM *realm;
+ realm = realm_find2(tmp->vp_strvalue);
+
/*
- * Catch users who set Proxy-To-Realm to a LOCAL
- * realm (sigh).
+ * Don't authenticate, as the request is going to
+ * be proxied.
*/
- realm = realm_find(tmp->vp_strvalue, 0);
- rad_assert((realm == NULL) || (realm->ipaddr.af == AF_INET));
- if (realm && (realm->ipaddr.ipaddr.ip4addr.s_addr == htonl(INADDR_NONE))) {
- DEBUG2(" WARNING: You set Proxy-To-Realm = %s, but it is a LOCAL realm! Cancelling invalid proxy request.", realm->realm);
- } else {
- /*
- * Don't authenticate, as the request is
- * proxied.
- */
+ if (realm && realm->auth_pool) {
return RLM_MODULE_OK;
}
+
+ /*
+ * Catch users who set Proxy-To-Realm to a LOCAL
+ * realm (sigh). But don't complain if it is
+ * *the* LOCAL realm.
+ */
+ if (realm &&(strcmp(realm->name, "LOCAL") != 0)) {
+ RDEBUG2("WARNING: You set Proxy-To-Realm = %s, but it is a LOCAL realm! Cancelling proxy request.", realm->name);
+ }
+
+ if (!realm) {
+ RDEBUG2("WARNING: You set Proxy-To-Realm = %s, but the realm does not exist! Cancelling invalid proxy request.", tmp->vp_strvalue);
+ }
}
+#ifdef WITH_PROXY
+ authenticate:
+#endif
+
/*
* Perhaps there is a Stripped-User-Name now.
*/
* wants to send back.
*/
if (result < 0) {
- DEBUG2("auth: Failed to validate the user.");
+ RDEBUG2("Failed to authenticate the user.");
request->reply->code = PW_AUTHENTICATION_REJECT;
- if ((module_msg = pairfind(request->packet->vps,PW_MODULE_FAILURE_MESSAGE)) != NULL){
+ if ((module_msg = pairfind(request->packet->vps,PW_MODULE_FAILURE_MESSAGE, 0)) != NULL){
char msg[MAX_STRING_LEN+19];
snprintf(msg, sizeof(msg), "Login incorrect (%s)",
/* double check: maybe the secret is wrong? */
if ((debug_flag > 1) && (auth_item != NULL) &&
(auth_item->attribute == PW_USER_PASSWORD)) {
- u_char *p;
+ char *p;
p = auth_item->vp_strvalue;
while (*p != '\0') {
}
}
+#ifdef WITH_SESSION_MGMT
if (result >= 0 &&
- (check_item = pairfind(request->config_items, PW_SIMULTANEOUS_USE)) != NULL) {
+ (check_item = pairfind(request->config_items, PW_SIMULTANEOUS_USE, 0)) != NULL) {
int r, session_type = 0;
+ char logstr[1024];
+ char umsg[MAX_STRING_LEN + 1];
+ const char *user_msg = NULL;
- tmp = pairfind(request->config_items, PW_SESSION_TYPE);
+ tmp = pairfind(request->config_items, PW_SESSION_TYPE, 0);
if (tmp) {
- DEBUG2(" Found Session-Type %s", tmp->vp_strvalue);
- session_type = tmp->lvalue;
+ RDEBUG2("Using Session-Type %s", tmp->vp_strvalue);
+ session_type = tmp->vp_integer;
}
/*
* for the Simultaneous-Use parameter.
*/
if (namepair &&
- (r = module_checksimul(session_type, request, check_item->lvalue)) != 0) {
+ (r = module_checksimul(session_type, request, check_item->vp_integer)) != 0) {
char mpp_ok = 0;
if (r == 2){
/* Multilink attempt. Check if port-limit > simultaneous-use */
VALUE_PAIR *port_limit;
- if ((port_limit = pairfind(request->reply->vps, PW_PORT_LIMIT)) != NULL &&
- port_limit->lvalue > check_item->lvalue){
- DEBUG2("main auth: MPP is OK");
+ if ((port_limit = pairfind(request->reply->vps, PW_PORT_LIMIT, 0)) != NULL &&
+ port_limit->vp_integer > check_item->vp_integer){
+ RDEBUG2("MPP is OK");
mpp_ok = 1;
}
}
if (!mpp_ok){
- if (check_item->lvalue > 1) {
+ if (check_item->vp_integer > 1) {
snprintf(umsg, sizeof(umsg),
"\r\nYou are already logged in %d times - access denied\r\n\n",
- (int)check_item->lvalue);
+ (int)check_item->vp_integer);
user_msg = umsg;
} else {
user_msg = "\r\nYou are already logged in - access denied\r\n\n";
* Remove ALL reply attributes.
*/
pairfree(&request->reply->vps);
- tmp = pairmake("Reply-Message", user_msg, T_OP_SET);
- request->reply->vps = tmp;
+ radius_pairmake(request, &request->reply->vps,
+ "Reply-Message",
+ user_msg, T_OP_SET);
snprintf(logstr, sizeof(logstr), "Multiple logins (max %d) %s",
- check_item->lvalue,
+ check_item->vp_integer,
r == 2 ? "[MPP attempt]" : "");
rad_authlog(logstr, request, 1);
}
}
}
+#endif
/*
* Result should be >= 0 here - if not, it means the user
* is rejected, so we just process post-auth and return.
*/
if (result < 0) {
- rad_postauth_reject(request);
return RLM_MODULE_REJECT;
}
/*
- * We might need this later. The 'password' string
- * is NOT used anywhere below here, except for logging,
- * so it should be safe...
- */
- if ((auth_item != NULL) && (auth_item->attribute == PW_CHAP_PASSWORD)) {
- password = "CHAP-Password";
- }
-
- /*
* Add the port number to the Framed-IP-Address if
* vp->addport is set.
*/
if (((tmp = pairfind(request->reply->vps,
- PW_FRAMED_IP_ADDRESS)) != NULL) &&
+ PW_FRAMED_IP_ADDRESS, 0)) != NULL) &&
(tmp->flags.addport != 0)) {
VALUE_PAIR *vpPortId;
* Find the NAS port ID.
*/
if ((vpPortId = pairfind(request->packet->vps,
- PW_NAS_PORT)) != NULL) {
- unsigned long tvalue = ntohl(tmp->lvalue);
- tmp->lvalue = htonl(tvalue + vpPortId->lvalue);
+ PW_NAS_PORT, 0)) != NULL) {
+ unsigned long tvalue = ntohl(tmp->vp_integer);
+ tmp->vp_integer = htonl(tvalue + vpPortId->vp_integer);
tmp->flags.addport = 0;
- ip_ntoa(tmp->vp_strvalue, tmp->lvalue);
+ ip_ntoa(tmp->vp_strvalue, tmp->vp_integer);
} else {
- DEBUG2("WARNING: No NAS-Port attribute in request. CANNOT return a Framed-IP-Address + NAS-Port.\n");
- pairdelete(&request->reply->vps, PW_FRAMED_IP_ADDRESS);
+ RDEBUG2("WARNING: No NAS-Port attribute in request. CANNOT return a Framed-IP-Address + NAS-Port.\n");
+ pairdelete(&request->reply->vps, PW_FRAMED_IP_ADDRESS, 0);
}
}
if (request->reply->code == 0)
request->reply->code = PW_AUTHENTICATION_ACK;
- if ((module_msg = pairfind(request->packet->vps,PW_MODULE_SUCCESS_MESSAGE)) != NULL){
+ if ((module_msg = pairfind(request->packet->vps,PW_MODULE_SUCCESS_MESSAGE, 0)) != NULL){
char msg[MAX_STRING_LEN+12];
snprintf(msg, sizeof(msg), "Login OK (%s)",
projects / freeradius.git / blobdiff