r4758: - added async support to the session request code

- added async support to the negprot client code

- removed two unused parameters from smbcli_full_connection() code

- converted smbclient to use smbcli_full_connection() rather than
  reinventing everything itself
(This used to be commit 71cbe2873473e039b4511511302cb63f1c50bce8)

1 files changed, 30 insertions, 5 deletions

diff --git a/source4/libcli/cliconnect.c b/source4/libcli/cliconnect.c
index a0ba5ae0a1..4d46d1d23c 100644
--- a/source4/libcli/cliconnect.c
+++ b/source4/libcli/cliconnect.c
@@ -57,7 +57,7 @@ BOOL smbcli_transport_establish(struct smbcli_state *cli,
 /* wrapper around smb_raw_negotiate() */
 NTSTATUS smbcli_negprot(struct smbcli_state *cli)
 {
-	return smb_raw_negotiate(cli->transport);
+	return smb_raw_negotiate(cli->transport, lp_maxprotocol());
 }
 
 /* wrapper around smb_raw_session_setup() */
@@ -155,14 +155,11 @@ NTSTATUS smbcli_full_connection(TALLOC_CTX *parent_ctx,
 				struct smbcli_state **ret_cli, 
 				const char *myname,
 				const char *host,
-				struct ipv4_addr *ip,
 				const char *sharename,
 				const char *devtype,
 				const char *username,
 				const char *domain,
-				const char *password,
-				uint_t flags,
-				BOOL *retry)
+				const char *password)
 {
 	struct smbcli_tree *tree;
 	NTSTATUS status;
@@ -231,3 +228,31 @@ void smbcli_shutdown(struct smbcli_state *cli)
 {
 	talloc_free(cli);
 }
+
+/*
+  parse a //server/share type UNC name
+*/
+BOOL smbcli_parse_unc(const char *unc_name, TALLOC_CTX *mem_ctx,
+		      const char **hostname, const char **sharename)
+{
+	char *p;
+
+	if (strncmp(unc_name, "\\\\", 2) &&
+	    strncmp(unc_name, "//", 2)) {
+		return False;
+	}
+
+	*hostname = talloc_strdup(mem_ctx, &unc_name[2]);
+	p = strchr_m(&(*hostname)[2],'/');
+	if (!p) {
+		p = strchr_m(&(*hostname)[2],'\\');
+		if (!p) return False;
+	}
+	*p = 0;
+	*sharename = talloc_strdup(mem_ctx, p+1);
+
+	return True;
+}
+
+
+