diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2003-12-31 08:45:03 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2003-12-31 08:45:03 +0000 |
| commit | 5d55674b52a516536a03e7f6d710a53efe7f5b8d (patch) | |
| tree | 93581800930be104f2c71dfec109cb1599519cdb /source3/nsswitch/winbindd_util.c | |
| parent | b34401b48ae96da278977bdf6d309a851386cf1c (diff) | |
| download | samba-5d55674b52a516536a03e7f6d710a53efe7f5b8d.tar.gz samba-5d55674b52a516536a03e7f6d710a53efe7f5b8d.tar.bz2 samba-5d55674b52a516536a03e7f6d710a53efe7f5b8d.zip | |
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 6a8cc7f0122ac4dd5b10ff1160735ef1a177d448)
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 a9bb851a7a..1f9537ac25 100644 --- a/source3/nsswitch/winbindd_util.c +++ b/source3/nsswitch/winbindd_util.c @@ -526,10 +526,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 { |