diff options
| author | Jeremy Allison <jra@samba.org> | 2007-11-21 17:42:52 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2007-11-21 17:42:52 -0800 |
| commit | 7ef6c19074495110d5c0b698b05c4ee52a0744d6 (patch) | |
| tree | 95c5b4fc4c4a2c36fc4327d19a3f0fb1596ff763 /source3/pam_smbpass/pam_smb_passwd.c | |
| parent | 01acd4bb3833733f7487ad86ea6542239fe3c90b (diff) | |
| download | samba-7ef6c19074495110d5c0b698b05c4ee52a0744d6.tar.gz samba-7ef6c19074495110d5c0b698b05c4ee52a0744d6.tar.bz2 samba-7ef6c19074495110d5c0b698b05c4ee52a0744d6.zip | |
Remove pstrings from pam_smbpass - make local_password_change
return malloced strings.
Jeremy.
(This used to be commit f652fe2bdb7a3a36e83dcf4b08347543fdffb9f0)
Diffstat (limited to 'source3/pam_smbpass/pam_smb_passwd.c')
| -rw-r--r-- | source3/pam_smbpass/pam_smb_passwd.c | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/source3/pam_smbpass/pam_smb_passwd.c b/source3/pam_smbpass/pam_smb_passwd.c index 25b7e2b623..f0fa018217 100644 --- a/source3/pam_smbpass/pam_smb_passwd.c +++ b/source3/pam_smbpass/pam_smb_passwd.c @@ -48,32 +48,29 @@ int smb_update_db( pam_handle_t *pamh, int ctrl, const char *user, const char *pass_new ) { int retval; - pstring err_str; - pstring msg_str; + char *err_str = NULL; + char *msg_str = NULL; - err_str[0] = '\0'; - msg_str[0] = '\0'; - - retval = NT_STATUS_IS_OK(local_password_change( user, LOCAL_SET_PASSWORD, pass_new, - err_str, sizeof(err_str), - msg_str, sizeof(msg_str) )); + retval = NT_STATUS_IS_OK(local_password_change(user, LOCAL_SET_PASSWORD, pass_new, + &err_str, + &msg_str)); if (!retval) { - if (*err_str) { - err_str[PSTRING_LEN-1] = '\0'; - make_remark( pamh, ctrl, PAM_ERROR_MSG, err_str ); + if (err_str) { + make_remark(pamh, ctrl, PAM_ERROR_MSG, err_str ); } /* FIXME: what value is appropriate here? */ retval = PAM_AUTHTOK_ERR; } else { - if (*msg_str) { - msg_str[PSTRING_LEN-1] = '\0'; - make_remark( pamh, ctrl, PAM_TEXT_INFO, msg_str ); + if (msg_str) { + make_remark(pamh, ctrl, PAM_TEXT_INFO, msg_str ); } retval = PAM_SUCCESS; } + SAFE_FREE(err_str); + SAFE_FREE(msg_str); return retval; } |