Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2015-04-25 20:45:02 +00:00
11 changed files with 114 additions and 106 deletions

View File

@ -69,6 +69,22 @@ session_find(const char *name)
return (RB_FIND(sessions, &sessions, &s));
}
/* Find session by id parsed from a string. */
struct session *
session_find_by_id_str(const char *s)
{
const char *errstr;
u_int id;
if (*s != '$')
return (NULL);
id = strtonum(s + 1, 0, UINT_MAX, &errstr);
if (errstr != NULL)
return (NULL);
return (session_find_by_id(id));
}
/* Find session by id. */
struct session *
session_find_by_id(u_int id)