Changeset 929

Timestamp:

Jul 25, 2016, 11:19:09 AM (9 years ago)

Author:

Paul Smedley

Message:

make it build using Samba 4.4.x

Location:

branches/client-3.0/src

Files:

• Config.km_ (modified) (2 diffs)
• Makefile.kmk (modified) (2 diffs)
• smbwrp.c (modified) (21 diffs)

branches/client-3.0/src/Config.km_

@@ -11 +11 @@
 # adjust also the date please
 #
-VERSION = 2.3.x
+VERSION = 3.0.x
 BUILD   = beta-date
 VENDOR  = netlabs
-SAMBA   = ../../samba-36
+SAMBA   = ../../samba-44
 TOOLKIT = u:/os2tk45
 
@@ -23 +23 @@
 GCC_LIB=e:/usr/lib
 
-# libsmb 3.3 is threadunsafe, change =0 to =1 if it works again
+# libsmb is threadunsafe, change =0 to =1 if it works again
 LIBSMB_THREAD_UNSAFE = LIBSMB_THREAD_SAFE=0

branches/client-3.0/src/Makefile.kmk

@@ -44 +44 @@
 ndpsmb_INCS = ./h ./rc \
                 $(SAMBA)        \
+                $(SAMBA)/bin/default/include/public     \
+                $(SAMBA)/bin/default/include    \
+                $(SAMBA)/bin/default    \
                 $(SAMBA)/source3 \
                 $(SAMBA)/source3/include \
@@ -49 +52 @@
                 $(SAMBA)/popt \
                 $(SAMBA)/lib/talloc \
+                $(SAMBA)/libcli \
                 $(SAMBA)/librpc \
                 $(SAMBA)/lib/tdb/include \
                 $(SAMBA)/lib/tevent
 
-ndpsmb_LIBS = libsmbclient libtalloc libtdb libwbclient libtevent z mmap
-ndpsmb_LIBS += $(GCC_LIB)/binmode.obj
+ndpsmb_LIBS = $(SAMBA)/smbcln44.lib
 ndpsmb_LIBPATH = $(SAMBA)/source3/bin $(Z_LIBDIR)
 

branches/client-3.0/src/smbwrp.c

@@ -24 +24 @@
 #include "libsmb/libsmb.h"
 #include "libsmb/clirap.h"
+#include "param.h"
+#include "smb/smbXcli_base.h"
 #include "trans2.h"
 #include "smbwrp.h"
+#include "util.h"
 
 /*
@@ -33 +36 @@
 int os2cli_errno(cli_state * cli)
 {
+#if 0 // cli->fd not available in Samba 4.x
         if (cli->fd == -1)
         {
                 return maperror( ENOTCONN);
         }
+#endif
         return maperror(cli_errno(cli));
 }
@@ -57 +62 @@
 
         // init samba for debug messages
-        setup_logging(slogfile, false);
+        setup_logging(slogfile, DEBUG_FILE);
         lp_set_logfile(slogfile);
-        debug_parse_levels("10");
-
-}
+        reopen_logs();
+}
+
 const char * smbwrp_getVersion()
 {
@@ -80 +85 @@
         char *p;
 
+        struct loadparm_context *lp_ctx;
+        TALLOC_CTX *frame = talloc_stackframe();
+
         if (initialised) 
         {
@@ -86 +94 @@
         initialised = 1;
 
-        lp_set_in_client(true); /* Make sure that we tell lp_load we are client */
-
-        load_case_tables();
-
-        if (!lp_load(get_dyn_CONFIGFILE(),true,false,false,true)) {
-                debuglocal(0,("The initial smb.conf is missing, defaults are used!\n"));
-        }
-
+        smb_init_locale();
+
+        if (!lp_load_client(get_dyn_CONFIGFILE())) {
+                debuglocal(0,("Can't load %s, defaults are used!\n",get_dyn_CONFIGFILE()));
+        }
         load_interfaces();
 
@@ -219 +224 @@
 /***************************************************** 
 return a connection to a server
+loosely based on do_connect() from libsmb/clidfs.c
 *******************************************************/
 int _System smbwrp_connect( Resource* pRes, cli_state ** cli)
@@ -228 +234 @@
         struct nmb_name called, calling;
         char *p, *server_n = server;
-        fstring group;
-        struct sockaddr_storage ss;
         struct cli_state * c;
         char* dev_type;
         int loginerror = 0;
         NTSTATUS status;
-
-        zero_sockaddr(&ss);
+        int max_protocol = lp__client_max_protocol();
+        int port = 0; //NBT_SMB_PORT;
+        int name_type= 0x20;
+        int flags = 0;
+        enum protocol_types protocol;
+        const char *name = NULL;
 
         debuglocal(1,"Connecting to \\\\%s:*********@%s:%s\\%s. Master %s:%d\n", srv->username,  workgroup, server, share, srv->master, srv->ifmastergroup);
-
-        if (!*server) {
-                struct sockaddr_storage sip;
-
-                if (*workgroup)
-                {
-                        if (!find_master_ip(workgroup, &sip)) {
-                                return 1;
-                        }
-                        fstrcpy(group, inet_ntoa(sip.sin_addr));
-                        server_n = group;
-                } else
-                if (*srv->master)
-                {
-                        if (srv->ifmastergroup)
-                        {
-                                if (!find_master_ip(srv->master, &sip)) {
-                                        return 11;
-                                }
-                                strncpy(srv->master, inet_ntoa(sip.sin_addr), sizeof(srv->master) - 1);
-                                srv->ifmastergroup = 0;
-                        }
-                        server_n = srv->master;
-                } else
-                {
-                        return 10;
-                }               
-        }
-
-        make_nmb_name(&calling, global_myname(), 0x0);
-//      make_nmb_name(&calling, "WORK", 0x0); // this machine name
-        make_nmb_name(&called , server_n, 0x20);
-
- again:
-        zero_sockaddr(&ss);
-
-        /* have to open a new connection */
-        if (!(c=cli_initialise()))
-        {
-                return 2;
-        }
 
         cli_set_timeout(c, 10000); /* 10 seconds. */
@@ -288 +255 @@
         }
 
-        if (!NT_STATUS_IS_OK(cli_connect(c, server_n, &ss))) 
-        {
+        status = cli_connect_nb(
+                server, NULL, port, name_type, NULL,
+                SMB_SIGNING_DEFAULT, flags, &c);
+
+        if (!NT_STATUS_IS_OK(status)) {
+                debuglocal(4,"Connection to %s failed (Error %s)\n",
+                                server,
+                                nt_errstr(status));
                 return 3;
         }
 
-        if (!cli_session_request(c, &calling, &called)) {
+        if (max_protocol == PROTOCOL_DEFAULT) {
+                max_protocol = PROTOCOL_LATEST;
+        }
+        DEBUG(4,(" session request ok, c->timeout = %d\n",c->timeout));
+
+        status = smbXcli_negprot(c->conn, c->timeout,
+                                 lp_client_min_protocol(),
+                                 max_protocol);
+
+        if (!NT_STATUS_IS_OK(status)) {
+                debuglocal(4,"protocol negotiation failed: %s\n",
+                         nt_errstr(status));
                 cli_shutdown(c);
-                if (strcmp(called.name, "*SMBSERVER")) {
-                        make_nmb_name(&called , "*SMBSERVER", 0x20);
-                        goto again;
-                }
-                return 4;
-        }
-
-        debuglocal(4," session request ok\n");
-
-        if (!NT_STATUS_IS_OK(cli_negprot(c))) {
-                cli_shutdown(c);
-                return 5;
-        }
-
-        debuglocal(4," session setuping for <%s>/<********> in <%s> %08x %08x %08x\n", srv->username,  workgroup, c->protocol, c->sec_mode, c->capabilities);
+                return status;
+        }
 
         if (!NT_STATUS_IS_OK(cli_session_setup(c, srv->username, 
@@ -325 +296 @@
                 }
                 debuglocal(4,"Anonymous login successful\n");
-                status = cli_init_creds(c, "", lp_workgroup(), "");
-        } else {
-                status = cli_init_creds(c, srv->username, workgroup, srv->password);
         }
 
@@ -359 +327 @@
         }
 
-        debuglocal(4," tconx ok. cli caps %08x\n", c->capabilities);
+        debuglocal(4," tconx ok.\n");
         
         // save cli_state pointer
@@ -419 +387 @@
                 return maperror(EINVAL);
         }
-        
+        size_t nread;
         *result = 0;
-        ret = cli_read(cli, file->fd, buf, file->offset, count);
+        ret = cli_read(cli, file->fd, buf, file->offset, count, &nread);
         if (ret == -1) 
         {
+                debuglocal(4," smbwrp_read - cli_read ret = %d\n",ret);
                 return os2cli_errno(cli);
         }
 
-        file->offset += ret;
-        *result = ret;
+        file->offset += nread;
+        *result = nread;
+        debuglocal(4," smbwrp_read successful, nread = %d, ret = %d\n",nread,ret);
         return 0;       
 }
@@ -669 +639 @@
                 return maperror(EINVAL);
         }
-        debuglocal(4,"getattr %d %d <%s>\n", cli->capabilities & CAP_NOPATHINFO2, cli->capabilities & CAP_NT_SMBS, finfo->fname);
-        if (!(cli->capabilities & CAP_NOPATHINFO2) &&
-                NT_STATUS_IS_OK(cli_qpathinfo2(cli, finfo->fname, &ctime, &atime, &mtime, NULL,
+        debuglocal(4,"getattr %d %d <%s>\n", smb1cli_conn_capabilities(cli->conn) & CAP_NOPATHINFO2, smb1cli_conn_capabilities(cli->conn) & CAP_NT_SMBS, finfo->fname);
+
+        if (NT_STATUS_IS_OK(cli_qpathinfo2(cli, finfo->fname, &ctime, &atime, &mtime, NULL,
                            (off_t *)&finfo->size, (unsigned short *)&finfo->attr, &ino)))
         {
@@ -681 +651 @@
         }
 
+#if 0 // cli->fd not available in Samba 4.x
         if (cli->fd == -1)
         {
            /* fd == -1 means the connection is broken */
            return maperror(ENOTCONN);
+        }
+#endif
+
+        debuglocal(4, "smbwrp_getattr, calling cli_qpathinfo3\n");
+        if (NT_STATUS_IS_OK(cli_qpathinfo3(cli, finfo->fname, &ctime, &atime, &mtime, NULL,
+                           (off_t *)&finfo->size, (unsigned short *)&finfo->attr, &ino)))
+        {
+                finfo->attr &= 0x7F;
+                finfo->ctime = convert_timespec_to_time_t(ctime);
+                finfo->atime = convert_timespec_to_time_t(atime);
+                finfo->mtime = convert_timespec_to_time_t(mtime);
+                return 0;
         }
 
@@ -709 +692 @@
         
         /* if this is NT then don't bother with the getatr */
-        if (cli->capabilities & CAP_NT_SMBS && !(cli->capabilities & CAP_NOPATHINFO2)) 
+        if (smb1cli_conn_capabilities(cli->conn) & CAP_NT_SMBS/* && !(smb1cli_conn_capabilities(cli->conn) & CAP_NOPATHINFO2)*/) 
         {
                 int ret = cli_errno(cli);
@@ -728 +711 @@
                 finfo->atime = finfo->atime;  //was mtime
                 finfo->ctime = finfo->ctime;  //was mtime
-                cli->capabilities &= CAP_NOPATHINFO2;
                 return 0;
         }
@@ -782 +764 @@
 add a entry to a directory listing
 *******************************************************/
-static void smbwrp_dir_add(const char* mnt, smbwrp_fileinfo *finfo, const char *mask, void *state)
+static NTSTATUS smbwrp_dir_add(const char* mnt, smbwrp_fileinfo *finfo, const char *mask, void *state)
 {
         if (state && finfo)
@@ -814 +796 @@
 }
 
-static void smbwrp_printjob_add(struct print_job_info *job, void * state)
+static NTSTATUS smbwrp_printjob_add(struct print_job_info *job, void * state)
 {
         smbwrp_fileinfo finfo = {0};
@@ -832 +814 @@
 }
 
-static void smbwrp_share_add(const char *share, uint32 type, 
+static void smbwrp_share_add(const char *share, uint32_t type, 
                            const char *comment, void *state)
 {
@@ -852 +834 @@
  Modified from cli_list
 ****************************************************************************/
-static int list_files(struct cli_state *cli, const char *mask, uint16 attribute,
+static int list_files(struct cli_state *cli, const char *mask, uint16_t attribute,
                   void (*fn)(const char *, smbwrp_fileinfo *, const char *,
                              void *), void *state)
@@ -873 +855 @@
         }
 
-        if (cli_has_async_calls(cli)) {
+        if (smbXcli_conn_has_async_calls(cli->conn)) {
                 /*
                  * Can't use sync call while an async call is in flight
@@ -880 +862 @@
                 goto fail;
         }
-        ev = event_context_init(frame);
+        ev = samba_tevent_context_init(frame);
         if (ev == NULL) {
                 goto fail;
         }
 
-        info_level = (cli->capabilities & CAP_NT_SMBS)
+        info_level = (smb1cli_conn_capabilities(cli->conn) & CAP_NT_SMBS)
                 ? SMB_FIND_FILE_BOTH_DIRECTORY_INFO : SMB_FIND_EA_SIZE;