diff options
| author | Günther Deschner <gd@samba.org> | 2007-02-05 15:25:31 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:17:43 -0500 |
| commit | 44512030b1f8b6d45c917dd2cb292c981bb7a543 (patch) | |
| tree | 4c45210cd883c233c60b34c451634cd2a1f5daff /source3/nsswitch/pam_winbind.h | |
| parent | a25203818798f823d3a08134fa9d89118bc9adc3 (diff) | |
| download | samba-44512030b1f8b6d45c917dd2cb292c981bb7a543.tar.gz samba-44512030b1f8b6d45c917dd2cb292c981bb7a543.tar.bz2 samba-44512030b1f8b6d45c917dd2cb292c981bb7a543.zip | |
r21152: Correctly omit pam conversations when PAM_SILENT has been set by the
calling application.
Guenther
(This used to be commit ebfae9a671d2c960178228ba7fdcd07cb2f49a05)
Diffstat (limited to 'source3/nsswitch/pam_winbind.h')
| -rw-r--r-- | source3/nsswitch/pam_winbind.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source3/nsswitch/pam_winbind.h b/source3/nsswitch/pam_winbind.h index 91f662d5d0..d2bf7da9e3 100644 --- a/source3/nsswitch/pam_winbind.h +++ b/source3/nsswitch/pam_winbind.h @@ -110,44 +110,44 @@ do { \ #include "winbind_client.h" -#define PAM_WB_REMARK_DIRECT(h,x)\ +#define PAM_WB_REMARK_DIRECT(h,f,x)\ {\ const char *error_string = NULL; \ error_string = _get_ntstatus_error_string(x);\ if (error_string != NULL) {\ - _make_remark(h, PAM_ERROR_MSG, error_string);\ + _make_remark(h, f, PAM_ERROR_MSG, error_string);\ } else {\ - _make_remark(h, PAM_ERROR_MSG, x);\ + _make_remark(h, f, PAM_ERROR_MSG, x);\ };\ }; -#define PAM_WB_REMARK_DIRECT_RET(h,x)\ +#define PAM_WB_REMARK_DIRECT_RET(h,f,x)\ {\ const char *error_string = NULL; \ error_string = _get_ntstatus_error_string(x);\ if (error_string != NULL) {\ - _make_remark(h, PAM_ERROR_MSG, error_string);\ + _make_remark(h, f, PAM_ERROR_MSG, error_string);\ return ret;\ };\ - _make_remark(h, PAM_ERROR_MSG, x);\ + _make_remark(h, f, PAM_ERROR_MSG, x);\ return ret;\ }; -#define PAM_WB_REMARK_CHECK_RESPONSE_RET(h,x,y)\ +#define PAM_WB_REMARK_CHECK_RESPONSE_RET(h,f,x,y)\ {\ const char *ntstatus = x.data.auth.nt_status_string; \ const char *error_string = NULL; \ if (!strcasecmp(ntstatus,y)) {\ error_string = _get_ntstatus_error_string(y);\ if (error_string != NULL) {\ - _make_remark(h, PAM_ERROR_MSG, error_string);\ + _make_remark(h, f, PAM_ERROR_MSG, error_string);\ return ret;\ };\ if (x.data.auth.error_string[0] != '\0') {\ - _make_remark(h, PAM_ERROR_MSG, x.data.auth.error_string);\ + _make_remark(h, f, PAM_ERROR_MSG, x.data.auth.error_string);\ return ret;\ };\ - _make_remark(h, PAM_ERROR_MSG, y);\ + _make_remark(h, f, PAM_ERROR_MSG, y);\ return ret;\ };\ }; |