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/libsmb | |
| 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/libsmb')
| -rw-r--r-- | source3/libsmb/clientgen.c | 16 | ||||
| -rw-r--r-- | source3/libsmb/namequery.c | 2 | ||||
| -rw-r--r-- | source3/libsmb/smberr.c | 4 |
3 files changed, 9 insertions, 13 deletions
diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c index 093b3aedf9..7dc57bfb47 100644 --- a/source3/libsmb/clientgen.c +++ b/source3/libsmb/clientgen.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" #include "trans2.h" @@ -1633,9 +1631,9 @@ BOOL cli_session_request(struct cli_state *cli, char *host, int name_type, _smb_setlen(cli->outbuf,len); CVAL(cli->outbuf,0) = 0x81; -#ifdef USE_SSL +#ifdef WITH_SSL retry: -#endif /* USE_SSL */ +#endif /* WITH_SSL */ send_smb(cli->fd,cli->outbuf); DEBUG(5,("Sent session request\n")); @@ -1643,14 +1641,14 @@ retry: if (!client_receive_smb(cli->fd,cli->inbuf,cli->timeout)) return False; -#ifdef USE_SSL +#ifdef WITH_SSL if(CVAL(cli->inbuf,0) == 0x83 && CVAL(cli->inbuf,4) == 0x8e){ /* use ssl */ if(!sslutil_fd_is_ssl(cli->fd)){ if(sslutil_connect(cli->fd) == 0) goto retry; } } -#endif /* USE_SSL */ +#endif /* WITH_SSL */ if (CVAL(cli->inbuf,0) != 0x82) { /* This is the wrong place to put the error... JRA. */ @@ -1718,9 +1716,9 @@ void cli_shutdown(struct cli_state *cli) { if (cli->outbuf) free(cli->outbuf); if (cli->inbuf) free(cli->inbuf); -#ifdef USE_SSL +#ifdef WITH_SSL if (cli->fd != -1) sslutil_disconnect(cli->fd); -#endif /* USE_SSL */ +#endif /* WITH_SSL */ if (cli->fd != -1) close(cli->fd); memset(cli, 0, sizeof(*cli)); } diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c index a578ad8947..344806083a 100644 --- a/source3/libsmb/namequery.c +++ b/source3/libsmb/namequery.c @@ -313,7 +313,7 @@ FILE *startlmhosts(char *fname) { FILE *fp = fopen(fname,"r"); if (!fp) { - DEBUG(2,("startlmhosts: Can't open lmhosts file %s. Error was %s\n", + DEBUG(4,("startlmhosts: Can't open lmhosts file %s. Error was %s\n", fname, strerror(errno))); return NULL; } diff --git a/source3/libsmb/smberr.c b/source3/libsmb/smberr.c index ee751c0f80..c2d8884d73 100644 --- a/source3/libsmb/smberr.c +++ b/source3/libsmb/smberr.c @@ -18,9 +18,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#ifdef SYSLOG -#undef SYSLOG -#endif +#define NO_SYSLOG #include "includes.h" |