diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2004-01-06 01:59:20 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2004-01-06 01:59:20 +0000 |
| commit | 6d7eb1adf32b223a771237bf063517974f632036 (patch) | |
| tree | ab650099d57d6d114543bc00f60b386c8a06316e /source3/nsswitch/winbindd_cm.c | |
| parent | 827c68deb89b5bd14324c57db14274b36a0790d7 (diff) | |
| download | samba-6d7eb1adf32b223a771237bf063517974f632036.tar.gz samba-6d7eb1adf32b223a771237bf063517974f632036.tar.bz2 samba-6d7eb1adf32b223a771237bf063517974f632036.zip | |
Merge winbind from Samba 3.0 onto HEAD.
Changes include:
- header changes for better pre-compiled headers (tridge)
- get a list of sids for a given user (tridge)
- fix function prototype
and a few other minor things
Andrew Bartlett
(This used to be commit 60107efdc61247034424d008c6f1eb4d46a19881)
Diffstat (limited to 'source3/nsswitch/winbindd_cm.c')
| -rw-r--r-- | source3/nsswitch/winbindd_cm.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source3/nsswitch/winbindd_cm.c b/source3/nsswitch/winbindd_cm.c index c255d21102..2b561be31d 100644 --- a/source3/nsswitch/winbindd_cm.c +++ b/source3/nsswitch/winbindd_cm.c @@ -56,6 +56,7 @@ */ +#include "includes.h" #include "winbindd.h" #undef DBGC_CLASS @@ -183,8 +184,6 @@ static NTSTATUS cm_open_connection(const struct winbindd_domain *domain, const i machine_password, lp_workgroup()))) { DEBUG(4,("failed kerberos session setup with %s\n", nt_errstr(result))); - if (NT_STATUS_IS_OK(result)) - result = NT_STATUS_UNSUCCESSFUL; } } new_conn->cli->use_kerberos = False; |