Changeset 818 for trunk/client/src/smbwrp.c

Timestamp:

Sep 27, 2013, 1:57:24 PM (12 years ago)

Author:

Silvan Scherrer

Message:

Samba Client 2.1: timestamp work

File:

• trunk/client/src/smbwrp.c (modified) (11 diffs)

trunk/client/src/smbwrp.c

@@ -39 +39 @@
 static int
 net_share_enum_rpc(struct cli_state *cli,
-                   void (*fn)(const char *name,
-                              uint32 type,
-                              const char *comment,
-                              void *state),
-                   void *state)
+                void (*fn)(const char *name,
+                uint32 type,
+                const char *comment,
+                void *state),
+                void *state)
 {
         int i;
@@ -78 +78 @@
         info_ctr.ctr.ctr1 = &ctr1;
         status = rpccli_srvsvc_NetShareEnumAll(pipe_hnd, mem_ctx,
-                                              pipe_hnd->desthost,
-                                              &info_ctr,
-                                              0xffffffff,
-                                              &total_entries,
-                                              &resume_handle, 
-                                              &werr);
+                                                pipe_hnd->desthost,
+                                                &info_ctr,
+                                                0xffffffff,
+                                                &total_entries,
+                                                &resume_handle, 
+                                                &werr);
 
         /* Was it successful? */
@@ -128 +128 @@
         char slogfilename[] = "log.smbc";
         char *env = getenv("LOGFILES");
-                if (env != NULL)
-                {
-                   strncpy(slogfile, env, sizeof(slogfile) -1);
-                   strncat(slogfile, "\\", sizeof(slogfile) - strlen(slogfile) -1);
-                   strncat(slogfile, slogfilename, sizeof(slogfile) - strlen(slogfile) -1);
-                }
-                else
-                {
-                   strncpy(slogfile, slogfilename, sizeof(slogfile) -1);
-                }
-
-                // init samba for debug messages
-                setup_logging(slogfile, false);
-                lp_set_logfile(slogfile);
-                debug_parse_levels("10");
+        if (env != NULL)
+        {
+                strncpy(slogfile, env, sizeof(slogfile) -1);
+                strncat(slogfile, "\\", sizeof(slogfile) - strlen(slogfile) -1);
+                strncat(slogfile, slogfilename, sizeof(slogfile) - strlen(slogfile) -1);
+        }
+        else
+        {
+                strncpy(slogfile, slogfilename, sizeof(slogfile) -1);
+        }
+
+        // init samba for debug messages
+        setup_logging(slogfile, false);
+        lp_set_logfile(slogfile);
+        debug_parse_levels("10");
 
 }
@@ -201 +201 @@
 {
         /*
-         * Block SIGPIPE (from lib/util_sock.c: write())
-         * It is not needed and should not stop execution
-         */
+        Block SIGPIPE (from lib/util_sock.c: write())
+        It is not needed and should not stop execution
+        */
         BlockSignals(True, SIGPIPE);
 }
@@ -316 +316 @@
         char *rparam=NULL, *rdata=NULL;
         char *p;
-        
+
         param = SMB_MALLOC_ARRAY(char, 6+nlen+2);
         if (!param) {
@@ -331 +331 @@
 
         if (!cli_send_trans(cli, SMBtrans2, 
-                            NULL,                        /* name */
-                            -1, 0,                      /* fid, flags */
-                            &setup, 1, 0,                /* setup, length, max */
-                            param, param_len, 10,        /* param, length, max */
-                            NULL, data_len, cli->max_xmit /* data, length, max */
-                           )) {
+                        NULL,                           /* name */
+                        -1, 0,                          /* fid, flags */
+                        &setup, 1, 0,                   /* setup, length, max */
+                        param, param_len, 10,           /* param, length, max */
+                        NULL, data_len, cli->max_xmit   /* data, length, max */
+                        )) {
                 return False;
         }
@@ -342 +342 @@
         SAFE_FREE(param);
         if (!cli_receive_trans(cli, SMBtrans2,
-                               &rparam, &param_len,
-                               &rdata, &data_len)) {
+                        &rparam, &param_len,
+                        &rdata, &data_len)) {
                 return False;
         }
@@ -402 +402 @@
 
         if (!cli_send_trans(cli, SMBtrans2, 
-                            NULL,                          /* name */
-                            -1, 0,                        /* fid, flags */
-                            &setup, 1, 0,                  /* setup, length, max */
-                            param, param_len, 2,            /* param, length, max */
-                            NULL, data_len, cli->max_xmit   /* data, length, max */
-                           )) {
+                        NULL,                           /* name */
+                        -1, 0,                          /* fid, flags */
+                        &setup, 1, 0,                   /* setup, length, max */
+                        param, param_len, 2,            /* param, length, max */
+                        NULL, data_len, cli->max_xmit   /* data, length, max */
+                        )) {
                 return False;
         }
 
         if (!cli_receive_trans(cli, SMBtrans2,
-                               &rparam, &param_len,
-                               &rdata, &data_len)) {
+                        &rparam, &param_len,
+                        &rdata, &data_len)) {
                 return False;
         }
@@ -635 +635 @@
         }
         file->fd = fd;
-        file->newmtime = 0;
+        file->updatetime = 0;
         file->offset = 0;
         return 0;
@@ -686 +686 @@
         }
 
-        file->newmtime = 1;
+        file->updatetime = 1;
         file->offset += ret;
         *result = ret;
@@ -703 +703 @@
         }
 
+        debuglocal(4,"smpwrp_close updatetime: %d\n", file->updatetime);
+
+        if (file->updatetime == 1)
+        {
+                file->mtime = time(NULL);
+                debuglocal(4,"cli_close new mtime %lu\n", file->mtime);
+        }
         
         if (!NT_STATUS_IS_OK(cli_close(cli, file->fd)))
         {
-                return os2cli_errno(cli);
-        }
-        if (file->newmtime)
-        {
-                file->newmtime = 0;
-                file->mtime = time(NULL);
-                debuglocal(4,"cli_close new mtime %lu\n", file->mtime);
-        }
+                rc = os2cli_errno(cli);
+        }
+
+        if (!rc && (file->openattr || file->mtime || file->ctime))
+        {
+                debuglocal(4,"Set pathinfo on close %s %08x %d %d\n", file->fname, file->openattr, file->mtime, file->ctime);
+                if (!NT_STATUS_IS_OK(cli_setpathinfo(cli, file->fname, file->ctime, 0, file->mtime, 0, file->openattr))) 
+                {
+                        debuglocal(4,"Set pathinfo on close failed %d\n", os2cli_errno(cli));
+                        //rc = os2cli_errno(cli);
+                }
+        }
+
+        file->openattr = 0;
+        file->mtime = 0;
+        file->ctime = 0;
+        file->updatetime = 0;
         file->fd = -1;
         file->offset = 0;
-        if (file->openattr || file->mtime)
-        {
-                debuglocal(4,"Set attr on close %s %08x %d %d\n", file->fname, file->openattr, file->mtime, file->mtime);
-                if (!NT_STATUS_IS_OK(cli_setatr(cli, file->fname, file->openattr, file->mtime))) 
-                {
-                        debuglocal(4,"Set attr on close failed %d\n", os2cli_errno(cli));
-                        //rc = os2cli_errno(cli);
-                }
-                
-                file->openattr = 0;
-                file->mtime = 0;
-        }
         *file->fname = 0;
         return rc;