sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-25 17:57:42 +03:00
Code

Putting back the -p flag in smbclient.

Browse Source 
However, it seems that the -s flag
in smbclient is also ignored :-(
(This used to be commit f6c78192664d611d4663ed7459a2789315861eec)
This commit is contained in:
Richard Sharpe 1999-01-25 01:46:14 +00:00
parent 444dc51920
commit f5f913b001
4 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source3/client/client.c
View File

@ -29,6 +29,7 @@
struct cli_state *cli; struct cli_state *cli;
extern BOOL in_client; extern BOOL in_client;
static int port = SMB_PORT;
pstring cur_dir = "\\"; pstring cur_dir = "\\";
pstring cd_path = ""; pstring cd_path = "";
static pstring service; static pstring service;
@ -1642,12 +1643,16 @@ struct cli_state *do_connect(char *server, char *share)
make_nmb_name(&calling, global_myname, 0x0, ""); make_nmb_name(&calling, global_myname, 0x0, "");
make_nmb_name(&called , server, name_type, ""); make_nmb_name(&called , server, name_type, "");
if (port == 0)
port = 139; /* If not set, set to 139, FIXME, NUMBERS BAD */
again: again:
ip = ipzero; ip = ipzero;
if (have_ip) ip = dest_ip; if (have_ip) ip = dest_ip;
/* have to open a new connection */ /* have to open a new connection */
if (!(c=cli_initialise(NULL)) || !cli_connect(c, server_n, &ip)) { if (!(c=cli_initialise(NULL)) || (cli_set_port(c, port) == 0) ||
!cli_connect(c, server_n, &ip)) {
DEBUG(0,("Connection to %s failed\n", server_n)); DEBUG(0,("Connection to %s failed\n", server_n));
return NULL; return NULL;
} }
@ -1909,7 +1914,6 @@ static int do_message_op(void)
{ {
fstring base_directory; fstring base_directory;
char *pname = argv[0]; char *pname = argv[0];
int port = SMB_PORT;
int opt; int opt;
extern FILE *dbf; extern FILE *dbf;
extern char *optarg; extern char *optarg;

1
source3/include/client.h
View File

@ -72,6 +72,7 @@ struct pwd_info
}; };
struct cli_state { struct cli_state {
int port;
int fd; int fd;
uint16 cnum; uint16 cnum;
uint16 pid; uint16 pid;

18
source3/libsmb/clientgen.c
View File

@ -27,6 +27,19 @@
extern int DEBUGLEVEL; extern int DEBUGLEVEL;
/*
* set the port that will be used for connections by the client
*/
int cli_set_port(struct cli_state *cli, int port)
{
if (port != 0)
cli -> port = port;
return cli -> port; /* return it incase caller wants it */
}
/**************************************************************************** /****************************************************************************
recv an smb recv an smb
@ -2355,8 +2368,10 @@ BOOL cli_connect(struct cli_state *cli, const char *host, struct in_addr *ip)
} }
if (cli -> port == 0) cli -> port = 139;
cli->fd = open_socket_out(SOCK_STREAM, &cli->dest_ip, cli->fd = open_socket_out(SOCK_STREAM, &cli->dest_ip,
139, cli->timeout); cli -> port, cli->timeout);
if (cli->fd == -1) if (cli->fd == -1)
return False; return False;
@ -2382,6 +2397,7 @@ struct cli_state *cli_initialise(struct cli_state *cli)
ZERO_STRUCTP(cli); ZERO_STRUCTP(cli);
cli -> port = 0;
cli->fd = -1; cli->fd = -1;
cli->cnum = -1; cli->cnum = -1;
cli->pid = (uint16)getpid(); cli->pid = (uint16)getpid();

9
source3/smbd/ssl.c
View File

@ -19,9 +19,16 @@
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#include "includes.h"
/*
* Hmmm, only check on WITH_SSL after we have included includes.h
* which pulls in config.h which is where WITH_SSL is defined, if
* at all :-)
*/
#ifdef WITH_SSL /* should always be defined if this module is compiled */ #ifdef WITH_SSL /* should always be defined if this module is compiled */
#include "includes.h"
#include <ssl.h> #include <ssl.h>
#include <err.h> #include <err.h>