diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2004-01-05 23:38:49 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2004-01-05 23:38:49 +0000 |
| commit | 0c78e6fc3e8df9ad9480d3b1b6b2d5a3eb19bf45 (patch) | |
| tree | 51c2a4591d71de1e2e1e85c70062007d0af05632 /source3/nsswitch/winbindd_util.c | |
| parent | b46ec1aac99454fff4419f5db1f460543597ebe4 (diff) | |
| download | samba-0c78e6fc3e8df9ad9480d3b1b6b2d5a3eb19bf45.tar.gz samba-0c78e6fc3e8df9ad9480d3b1b6b2d5a3eb19bf45.tar.bz2 samba-0c78e6fc3e8df9ad9480d3b1b6b2d5a3eb19bf45.zip | |
(merge from 3.0)
Changes to our PAM code to cope with the fact that we can't handle some
domains (in particular, the domain of the current machine, if it is not a PDC)
By changing the error codes, we now return values that PAM can correctly
use for better stacking of PAM modules - in particular of the password change
module.
This allows pam_winbind to co-exist with other pam modules for password changes.
Andrew Bartlett
(This used to be commit 06b4eb4b9f867998c8faf9a91830ba3181cdf605)
Diffstat (limited to 'source3/nsswitch/winbindd_util.c')
| -rw-r--r-- | source3/nsswitch/winbindd_util.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source3/nsswitch/winbindd_util.c b/source3/nsswitch/winbindd_util.c index 318da4a63a..0f14a7e413 100644 --- a/source3/nsswitch/winbindd_util.c +++ b/source3/nsswitch/winbindd_util.c @@ -525,10 +525,8 @@ BOOL parse_domain_user(const char *domuser, fstring domain, fstring user) if ( assume_domain(lp_workgroup())) { fstrcpy(domain, lp_workgroup()); - } else if (assume_domain(get_global_sam_name())) { - fstrcpy( domain, get_global_sam_name() ); } else { - fstrcpy( domain, ""); + fstrcpy( domain, get_global_sam_name() ); } } else { |