diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2003-04-30 13:56:02 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2003-04-30 13:56:02 +0000 |
| commit | d1607e1cdbf9386f5e6084eda4edd974006fc19f (patch) | |
| tree | c1e5dadcc20679a3fb9d5f9a236936860628c527 | |
| parent | 09391fc57d39223e404b54684149dafa86d3d482 (diff) | |
| download | samba-d1607e1cdbf9386f5e6084eda4edd974006fc19f.tar.gz samba-d1607e1cdbf9386f5e6084eda4edd974006fc19f.tar.bz2 samba-d1607e1cdbf9386f5e6084eda4edd974006fc19f.zip | |
Get pam_smbpass to compile again (it probably won't link or run, but at least
it compiles and lets the build farm get on it's way)
(This used to be commit 7498d69d9d69f70a4c7511b5032d7d5d2b9c846f)
| -rw-r--r-- | source3/pam_smbpass/pam_smb_passwd.c | 4 | ||||
| -rw-r--r-- | source3/pam_smbpass/support.c | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/source3/pam_smbpass/pam_smb_passwd.c b/source3/pam_smbpass/pam_smb_passwd.c index 8fbef1fbf7..1d022af16c 100644 --- a/source3/pam_smbpass/pam_smb_passwd.c +++ b/source3/pam_smbpass/pam_smb_passwd.c @@ -298,8 +298,8 @@ int pam_sm_chauthtok(pam_handle_t *pamh, int flags, uid_t uid; /* password updated */ - if (!sid_to_uid(sampass, &uid)) { - _log_err( LOG_NOTICE "Unable to get uid for user %s", + if (!sid_to_uid(pdb_get_user_sid(sampass), &uid)) { + _log_err( LOG_NOTICE, "Unable to get uid for user %s", pdb_get_username(sampass)); _log_err( LOG_NOTICE, "password for (%s) changed by (%s/%d)", user, uidtoname(getuid()), getuid()); diff --git a/source3/pam_smbpass/support.c b/source3/pam_smbpass/support.c index 61d9c6a8ab..d3232237ac 100644 --- a/source3/pam_smbpass/support.c +++ b/source3/pam_smbpass/support.c @@ -308,7 +308,6 @@ void _cleanup_failures( pam_handle_t * pamh, void *fl, int err ) int _smb_verify_password( pam_handle_t * pamh, SAM_ACCOUNT *sampass, const char *p, unsigned int ctrl ) { - uchar hash_pass[16]; uchar lm_pw[16]; uchar nt_pw[16]; int retval = PAM_AUTH_ERR; @@ -375,7 +374,6 @@ int _smb_verify_password( pam_handle_t * pamh, SAM_ACCOUNT *sampass, pam_get_item( pamh, PAM_SERVICE, (const void **)&service ); if (data_name != NULL) { - int type; struct _pam_failed_auth *new = NULL; const struct _pam_failed_auth *old = NULL; @@ -401,7 +399,7 @@ int _smb_verify_password( pam_handle_t * pamh, SAM_ACCOUNT *sampass, service ? service : "**unknown**", name); new->count = 1; } - if (!sid_to_uid(pdb_get_user_sid(sampass, &(new->id), &type))) { + if (!sid_to_uid(pdb_get_user_sid(sampass), &(new->id))) { _log_err(LOG_NOTICE, "failed auth request by %s for service %s as %s", uidtoname(getuid()), |