summaryrefslogtreecommitdiffstats
path: root/source/client/clientutil.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>1998-07-29 03:08:05 +0000
committerAndrew Tridgell <tridge@samba.org>1998-07-29 03:08:05 +0000
commit3bda7ac417107a7b01d91805ca71c4330657ed21 (patch)
tree0fb2fb0cbd2df1b77ea814ba30e2bb1f8a1d999f /source/client/clientutil.c
parent7b3a9d6285cc0d1967155a68845e28c6296ecc67 (diff)
downloadsamba-3bda7ac417107a7b01d91805ca71c4330657ed21.tar.gz
samba-3bda7ac417107a7b01d91805ca71c4330657ed21.tar.xz
samba-3bda7ac417107a7b01d91805ca71c4330657ed21.zip
merge from the autoconf2 branch to the main branch
Diffstat (limited to 'source/client/clientutil.c')
-rw-r--r--source/client/clientutil.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/source/client/clientutil.c b/source/client/clientutil.c
index e63f668481b..da5ea531d28 100644
--- a/source/client/clientutil.c
+++ b/source/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)){