diff options
| author | Gerald Carter <jerry@samba.org> | 2007-03-20 16:56:16 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2007-03-20 16:56:16 +0000 |
| commit | 651d5a89c59c107c05e789358624058e16af1b66 (patch) | |
| tree | dfd29754255ea87b30eb16a06c505e42f98b9be3 /source/nsswitch/pam_winbind.c | |
| parent | 0f475ed1a387e37d477fd434c06ad5783c58adea (diff) | |
| download | samba-651d5a89c59c107c05e789358624058e16af1b66.tar.gz samba-651d5a89c59c107c05e789358624058e16af1b66.tar.xz samba-651d5a89c59c107c05e789358624058e16af1b66.zip | |
r21889: * Pull from SAMBA-3_0_25 svn r21888
* Set version to 3.0.25pre2
Diffstat (limited to 'source/nsswitch/pam_winbind.c')
| -rw-r--r-- | source/nsswitch/pam_winbind.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/nsswitch/pam_winbind.c b/source/nsswitch/pam_winbind.c index d21c985feee..66f9a093144 100644 --- a/source/nsswitch/pam_winbind.c +++ b/source/nsswitch/pam_winbind.c @@ -436,7 +436,7 @@ static int pam_winbind_request(pam_handle_t * pamh, int ctrl, /* Fill in request and send down pipe */ init_request(request, req_type); - if (write_sock(request, sizeof(*request), 0) == -1) { + if (write_sock(request, sizeof(*request), 0, 1) == -1) { _pam_log(pamh, ctrl, LOG_ERR, "pam_winbind_request: write to socket failed!"); close_sock(); return PAM_SERVICE_ERR; @@ -1517,7 +1517,6 @@ int pam_sm_authenticate(pam_handle_t *pamh, int flags, dictionary *d = NULL; char *username_ret = NULL; char *new_authtok_required = NULL; - char *combined_member = NULL; const char *real_username = NULL; /* parse arguments */ |