diff options
| author | Gerald Carter <jerry@samba.org> | 2005-02-04 00:25:33 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:55:33 -0500 |
| commit | 44be949f28774cae4e79704c1c8f5d624f2bd46c (patch) | |
| tree | 63b8c3ebd08132ecdf555d4e8687726a923afecb /source3/nsswitch | |
| parent | 8f87dcdcdab52efb0ef907ede71c0920a25b0d7b (diff) | |
| download | samba-44be949f28774cae4e79704c1c8f5d624f2bd46c.tar.gz samba-44be949f28774cae4e79704c1c8f5d624f2bd46c.tar.bz2 samba-44be949f28774cae4e79704c1c8f5d624f2bd46c.zip | |
r5207: patches from Jay Fenlason @ RedHat (scooped from their Fedora packages)
(This used to be commit 9019a8436162d3606f6b8584701b0832cf5a7439)
Diffstat (limited to 'source3/nsswitch')
| -rw-r--r-- | source3/nsswitch/pam_winbind.c | 4 | ||||
| -rw-r--r-- | source3/nsswitch/winbindd_ads.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/source3/nsswitch/pam_winbind.c b/source3/nsswitch/pam_winbind.c index bfd8dd45ee..ffe82b0bd2 100644 --- a/source3/nsswitch/pam_winbind.c +++ b/source3/nsswitch/pam_winbind.c @@ -4,7 +4,7 @@ Copyright Tim Potter <tpot@samba.org> 2000 Copyright Andrew Bartlett <abartlet@samba.org> 2002 - largely based on pam_userdb by Christian Gafton <gafton@redhat.com> + largely based on pam_userdb by Cristian Gafton <gafton@redhat.com> also contains large slabs of code from pam_unix by Elliot Lee <sopwith@redhat.com> (see copyright below for full details) */ @@ -696,7 +696,7 @@ PAM_EXTERN int pam_sm_chauthtok(pam_handle_t * pamh, int flags, lctrl = ctrl; if (on(WINBIND_USE_AUTHTOK_ARG, lctrl)) { - ctrl = WINBIND_USE_FIRST_PASS_ARG | lctrl; + lctrl |= WINBIND_USE_FIRST_PASS_ARG; } retry = 0; retval = PAM_AUTHTOK_ERR; diff --git a/source3/nsswitch/winbindd_ads.c b/source3/nsswitch/winbindd_ads.c index 335e21adcb..88a7d3ed3b 100644 --- a/source3/nsswitch/winbindd_ads.c +++ b/source3/nsswitch/winbindd_ads.c @@ -651,7 +651,8 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain *domain, NTSTATUS status = NT_STATUS_UNSUCCESSFUL; char *sidstr; char **members; - int i, num_members; + int i; + size_t num_members; fstring sid_string; BOOL more_values; const char **attrs; |