5.3 merge

This commit is contained in:
Sergei Golubchik 2012-10-18 23:33:06 +02:00
commit 68baf07dcd
40 changed files with 1108 additions and 140 deletions

View file

@ -12,7 +12,7 @@
Create /etc/pam.d/mariadb_mtr with
=========================================================
auth required pam_mariadb_mtr.so pam_test
account required pam_mariadb_mtr.so
account required pam_permit.so
=========================================================
*/
@ -23,9 +23,8 @@ account required pam_mariadb_mtr.so
#define N 3
PAM_EXTERN int
pam_sm_authenticate(pam_handle_t *pamh, int flags,
int argc, const char *argv[])
int pam_sm_authenticate(pam_handle_t *pamh, int flags,
int argc, const char *argv[])
{
struct pam_conv *conv;
struct pam_response *resp = 0;
@ -71,17 +70,8 @@ ret:
return retval;
}
PAM_EXTERN int
pam_sm_setcred(pam_handle_t *pamh, int flags,
int argc, const char *argv[])
{
return PAM_SUCCESS;
}
PAM_EXTERN int
pam_sm_acct_mgmt(pam_handle_t *pamh, int flags,
int argc, const char *argv[])
int pam_sm_setcred(pam_handle_t *pamh, int flags,
int argc, const char *argv[])
{
return PAM_SUCCESS;