diff options
author | Gerald Carter <jerry@samba.org> | 2002-10-08 18:29:57 +0000 |
---|---|---|
committer | Gerald Carter <jerry@samba.org> | 2002-10-08 18:29:57 +0000 |
commit | 876afb5d0f60a7c358b7b3023e59093ce192aa6b (patch) | |
tree | 1e1245ff78c1ceaf874c684780bd0e88de863fcb /source3/nsswitch/winbindd_cm.c | |
parent | 5bf57880e7893005bd51a76860dd4752954370d0 (diff) | |
download | samba-876afb5d0f60a7c358b7b3023e59093ce192aa6b.tar.gz samba-876afb5d0f60a7c358b7b3023e59093ce192aa6b.tar.bz2 samba-876afb5d0f60a7c358b7b3023e59093ce192aa6b.zip |
merge from APP_HEAD
* s/driverlocation/comment
* detect native mode domain and enumerate local groups
Also
* Added sendfile stats from SAMBA_2_2
(This used to be commit 764b58e2c0b3179cffe157c0ab58761b156b8423)
Diffstat (limited to 'source3/nsswitch/winbindd_cm.c')
-rw-r--r-- | source3/nsswitch/winbindd_cm.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/source3/nsswitch/winbindd_cm.c b/source3/nsswitch/winbindd_cm.c index def73edde6..cb1779f590 100644 --- a/source3/nsswitch/winbindd_cm.c +++ b/source3/nsswitch/winbindd_cm.c @@ -462,6 +462,15 @@ static NTSTATUS cm_open_connection(const char *domain, const int pipe_index, if ( !cli_nt_session_open (new_conn->cli, pipe_index) ) { result = NT_STATUS_PIPE_NOT_AVAILABLE; + /* + * only cache a failure if we are not trying to open the + * **win2k** specific lsarpc UUID. This could be an NT PDC + * and therefore a failure is normal. This should probably + * be abstracted to a check for 2k specific pipes and wondering + * if the PDC is an NT4 box. but since there is only one 2k + * specific UUID right now, i'm not going to bother. --jerry + */ + if ( !is_win2k_pipe(pipe_index) ) add_failed_connection_entry(new_conn, result); cli_shutdown(new_conn->cli); return result; @@ -563,7 +572,7 @@ BOOL cm_check_for_native_mode_win2k( const char *domain ) if ( !NT_STATUS_IS_OK(result = cm_open_connection(domain, PI_LSARPC_DS, &conn)) ) { - DEBUG(3, ("cm_check_for_native_mode_win2k: Could not open a connection to %s for PIPE_LSARPC (%s)\n", + DEBUG(5, ("cm_check_for_native_mode_win2k: Could not open a connection to %s for PIPE_LSARPC (%s)\n", domain, nt_errstr(result))); return False; } |