added conn_name to xauth_module.verify_secret() function call
This commit is contained in:
+1
-1
@@ -647,7 +647,7 @@ xauth_get_secret(xauth_t *xauth_secret)
|
|||||||
* find a matching secret
|
* find a matching secret
|
||||||
*/
|
*/
|
||||||
static bool
|
static bool
|
||||||
xauth_verify_secret(const xauth_t *xauth_secret)
|
xauth_verify_secret(const char *conn_name, const xauth_t *xauth_secret)
|
||||||
{
|
{
|
||||||
bool found = FALSE;
|
bool found = FALSE;
|
||||||
secret_t *s;
|
secret_t *s;
|
||||||
|
|||||||
+2
-1
@@ -978,7 +978,8 @@ xauth_inR1(struct msg_digest *md)
|
|||||||
, ia.xauth_secret.user_password.ptr)
|
, ia.xauth_secret.user_password.ptr)
|
||||||
)
|
)
|
||||||
/* verify the user credentials using a plugn function */
|
/* verify the user credentials using a plugn function */
|
||||||
st->st_xauth.status = xauth_module.verify_secret(&ia.xauth_secret);
|
st->st_xauth.status = xauth_module.verify_secret(st->st_connection->name
|
||||||
|
, &ia.xauth_secret);
|
||||||
plog("extended authentication %s", st->st_xauth.status? "was successful":"failed");
|
plog("extended authentication %s", st->st_xauth.status? "was successful":"failed");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -44,7 +44,7 @@ xauth_init(void)
|
|||||||
DBG_log("xauth module: found get_secret() function");
|
DBG_log("xauth module: found get_secret() function");
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
xauth_module.verify_secret = (bool (*) (const xauth_t*))
|
xauth_module.verify_secret = (bool (*) (const char*, const xauth_t*))
|
||||||
dlsym(xauth_module.handle, "verify_secret");
|
dlsym(xauth_module.handle, "verify_secret");
|
||||||
DBG(DBG_CONTROL,
|
DBG(DBG_CONTROL,
|
||||||
if (xauth_module.verify_secret != NULL)
|
if (xauth_module.verify_secret != NULL)
|
||||||
|
|||||||
+1
-1
@@ -30,7 +30,7 @@ typedef struct {
|
|||||||
typedef struct {
|
typedef struct {
|
||||||
void *handle;
|
void *handle;
|
||||||
bool (*get_secret) (xauth_t *xauth_secret);
|
bool (*get_secret) (xauth_t *xauth_secret);
|
||||||
bool (*verify_secret) (const xauth_t *xauth_secret);
|
bool (*verify_secret) (const char *conn_name, const xauth_t *xauth_secret);
|
||||||
} xauth_module_t;
|
} xauth_module_t;
|
||||||
|
|
||||||
extern xauth_module_t xauth_module;
|
extern xauth_module_t xauth_module;
|
||||||
|
|||||||
Reference in New Issue
Block a user