Changeset 745 for trunk/server/source4/libcli/cliconnect.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/libcli/cliconnect.c (modified) (5 diffs)

trunk/server/source4/libcli/cliconnect.c

@@ -36 +36 @@
                            struct resolve_context *resolve_ctx,
                            struct smbcli_options *options,
-                           struct smb_iconv_convenience *iconv_convenience,
                const char *socket_options)
 {
@@ -47 +46 @@
         if (sock == NULL) return false;
         
-        cli->transport = smbcli_transport_init(sock, cli, true, options, 
-                                                                                   iconv_convenience);
+        cli->transport = smbcli_transport_init(sock, cli, true, options);
         if (!cli->transport) {
                 return false;
@@ -155 +153 @@
                                 struct smbcli_options *options,
                                 struct smbcli_session_options *session_options,
-                                struct smb_iconv_convenience *iconv_convenience,
                                 struct gensec_settings *gensec_settings)
 {
@@ -170 +167 @@
                                              options,
                                              session_options,
-                                                 iconv_convenience,
                                                  gensec_settings);
         if (!NT_STATUS_IS_OK(status)) {
@@ -239 +235 @@
         char *p;
 
-        *hostname = *sharename = NULL;
-
         if (strncmp(unc_name, "\\\\", 2) &&
             strncmp(unc_name, "//", 2)) {
                 return false;
         }
+
+        *hostname = *sharename = NULL;
 
         *hostname = talloc_strdup(mem_ctx, &unc_name[2]);