diff options
| author | Andrew Tridgell <tridge@samba.org> | 1998-07-29 03:08:05 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 1998-07-29 03:08:05 +0000 |
| commit | 64578c0589a3a741f81fb55c16eeb882128da00b (patch) | |
| tree | 8b650156e44e4d39af8625185d857a88789b8074 /source3/client/clientutil.c | |
| parent | c48b3fce6be6d5d952cbcda0ddae223dda5a576f (diff) | |
| download | samba-64578c0589a3a741f81fb55c16eeb882128da00b.tar.gz samba-64578c0589a3a741f81fb55c16eeb882128da00b.tar.bz2 samba-64578c0589a3a741f81fb55c16eeb882128da00b.zip | |
merge from the autoconf2 branch to the main branch
(This used to be commit 3bda7ac417107a7b01d91805ca71c4330657ed21)
Diffstat (limited to 'source3/client/clientutil.c')
| -rw-r--r-- | source3/client/clientutil.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source3/client/clientutil.c b/source3/client/clientutil.c index e63f668481..da5ea531d2 100644 --- a/source3/client/clientutil.c +++ b/source3/client/clientutil.c @@ -19,9 +19,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifdef SYSLOG -#undef SYSLOG -#endif +#define NO_SYSLOG #include "includes.h" @@ -338,9 +336,9 @@ BOOL cli_send_session_request(char *inbuf,char *outbuf) _smb_setlen(outbuf,len); CVAL(outbuf,0) = 0x81; -#ifdef USE_SSL +#ifdef WITH_SSL retry: -#endif /* USE_SSL */ +#endif /* WITH_SSL */ send_smb(Client,outbuf); DEBUG(5,("Sent session request\n")); @@ -377,7 +375,7 @@ retry: return cli_send_session_request(inbuf,outbuf); } /* C. Hoch 9/14/95 End */ -#ifdef USE_SSL +#ifdef WITH_SSL if(CVAL(inbuf,0) == 0x83 && CVAL(inbuf,4) == 0x8e) { /* use ssl */ fprintf(stderr, "Making secure connection\n"); if(!sslutil_fd_is_ssl(Client)){ |