Changeset 745 for trunk/server/source3/libsmb/libsmb_stat.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)
• source3/libsmb/libsmb_stat.c (modified) (19 diffs)

trunk/server/source3/libsmb/libsmb_stat.c

@@ -8 +8 @@
    Copyright (C) Derrell Lipman 2003-2008
    Copyright (C) Jeremy Allison 2007, 2008
-   
+
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -24 +24 @@
 
 #include "includes.h"
+#include "libsmb/libsmb.h"
 #include "libsmbclient.h"
 #include "libsmb_internal.h"
@@ -37 +38 @@
 {
         if (!context || !context->internal->initialized) {
-                
                 errno = EINVAL;
                 return -1;
-                
-        }
-        
+        }
+
         if (!*name) return 2; /* FIXME, why 2 ??? */
         return (ino_t)str_checksum(name);
-        
 }
 
@@ -61 +59 @@
 {
         TALLOC_CTX *frame = talloc_stackframe();
-        
+
         st->st_mode = 0;
-        
+
         if (IS_DOS_DIR(mode)) {
                 st->st_mode = SMBC_DIR_MODE;
@@ -69 +67 @@
                 st->st_mode = SMBC_FILE_MODE;
         }
-        
+
         if (IS_DOS_ARCHIVE(mode)) st->st_mode |= S_IXUSR;
         if (IS_DOS_SYSTEM(mode)) st->st_mode |= S_IXGRP;
         if (IS_DOS_HIDDEN(mode)) st->st_mode |= S_IXOTH;
         if (!IS_DOS_READONLY(mode)) st->st_mode |= S_IWUSR;
-        
+
         st->st_size = size;
 #ifdef HAVE_STAT_ST_BLKSIZE
@@ -87 +85 @@
         st->st_uid = getuid();
         st->st_gid = getgid();
-        
+
         if (IS_DOS_DIR(mode)) {
                 st->st_nlink = 2;
@@ -93 +91 @@
                 st->st_nlink = 1;
         }
-        
+
         if (st->st_ino == 0) {
                 st->st_ino = generate_inode(context, fname);
         }
-        
+
         TALLOC_FREE(frame);
         return True;  /* FIXME: Is this needed ? */
-        
 }
 
@@ -126 +123 @@
         SMB_INO_T ino = 0;
         TALLOC_CTX *frame = talloc_stackframe();
-        
+
         if (!context || !context->internal->initialized) {
-                
                 errno = EINVAL;  /* Best I can think of ... */
                 TALLOC_FREE(frame);
                 return -1;
         }
-        
+
         if (!fname) {
                 errno = EINVAL;
@@ -139 +135 @@
                 return -1;
         }
-        
+
         DEBUG(4, ("smbc_stat(%s)\n", fname));
-        
+
         if (SMBC_parse_path(frame,
                             context,
@@ -165 +161 @@
                 }
         }
-        
+
         srv = SMBC_server(frame, context, True,
                           server, share, &workgroup, &user, &password);
-        
         if (!srv) {
                 TALLOC_FREE(frame);
                 return -1;  /* errno set by SMBC_server */
         }
-        
+
         if (!SMBC_getatr(context, srv, path, &mode, &size,
                          NULL,
@@ -184 +179 @@
                 return -1;
         }
-        
+
         st->st_ino = ino;
-        
+
         setup_stat(context, st, (char *) fname, size, mode);
-        
+
         st->st_atime = convert_timespec_to_time_t(access_time_ts);
         st->st_ctime = convert_timespec_to_time_t(change_time_ts);
         st->st_mtime = convert_timespec_to_time_t(write_time_ts);
         st->st_dev   = srv->dev;
-        
+
         TALLOC_FREE(frame);
         return 0;
-        
 }
 
@@ -222 +216 @@
         SMB_INO_T ino = 0;
         TALLOC_CTX *frame = talloc_stackframe();
-        
+
         if (!context || !context->internal->initialized) {
-                
                 errno = EINVAL;
                 TALLOC_FREE(frame);
                 return -1;
         }
-        
+
         if (!file || !SMBC_dlist_contains(context->internal->files, file)) {
                 errno = EBADF;
@@ -235 +228 @@
                 return -1;
         }
-        
+
         if (!file->file) {
                 TALLOC_FREE(frame);
                 return smbc_getFunctionFstatdir(context)(context, file, st);
         }
-        
+
         /*d_printf(">>>fstat: parsing %s\n", file->fname);*/
         if (SMBC_parse_path(frame,
@@ -256 +249 @@
                 return -1;
         }
-        
+
         /*d_printf(">>>fstat: resolving %s\n", path);*/
         if (!cli_resolve_path(frame, "", context->internal->auth_info,
-                        file->srv->cli, path,
-                        &targetcli, &targetpath)) {
+                              file->srv->cli, path,
+                              &targetcli, &targetpath)) {
                 d_printf("Could not resolve %s\n", path);
                 errno = ENOENT;
@@ -267 +260 @@
         }
         /*d_printf(">>>fstat: resolved path as %s\n", targetpath);*/
-        
-        if (!cli_qfileinfo(targetcli, file->cli_fd, &mode, &size,
-                           NULL,
-                           &access_time_ts,
-                           &write_time_ts,
-                           &change_time_ts,
-                           &ino)) {
-                
+
+        if (!NT_STATUS_IS_OK(cli_qfileinfo_basic(
+                                     targetcli, file->cli_fd, &mode, &size,
+                                     NULL,
+                                     &access_time_ts,
+                                     &write_time_ts,
+                                     &change_time_ts,
+                                     &ino))) {
                 time_t change_time, access_time, write_time;
-                
+
                 if (!NT_STATUS_IS_OK(cli_getattrE(targetcli, file->cli_fd, &mode, &size,
                                   &change_time, &access_time, &write_time))) {
-                        
                         errno = EINVAL;
                         TALLOC_FREE(frame);
                         return -1;
                 }
-                
                 change_time_ts = convert_time_t_to_timespec(change_time);
                 access_time_ts = convert_time_t_to_timespec(access_time);
                 write_time_ts = convert_time_t_to_timespec(write_time);
         }
-        
+
         st->st_ino = ino;
-        
+
         setup_stat(context, st, file->fname, size, mode);
-        
+
         st->st_atime = convert_timespec_to_time_t(access_time_ts);
         st->st_ctime = convert_timespec_to_time_t(change_time_ts);
         st->st_mtime = convert_timespec_to_time_t(write_time_ts);
         st->st_dev = file->srv->dev;
-        
+
         TALLOC_FREE(frame);
         return 0;
-        
 }
 
@@ -369 +359 @@
         uint32 fs_attrs = 0;
         struct cli_state *cli = file->srv->cli;
-                
 
         /* Initialize all fields (at least until we actually use them) */
@@ -390 +379 @@
                 uint64_t sectors_per_allocation_unit;
                 uint64_t bytes_per_sector;
-                
+                NTSTATUS status;
+
                 /* Nope. If size data is available... */
-                if (cli_get_fs_full_size_info(cli,
-                                              &total_allocation_units,
-                                              &caller_allocation_units,
-                                              &actual_allocation_units,
-                                              &sectors_per_allocation_unit,
-                                              &bytes_per_sector)) {
+                status = cli_get_fs_full_size_info(cli,
+                                                   &total_allocation_units,
+                                                   &caller_allocation_units,
+                                                   &actual_allocation_units,
+                                                   &sectors_per_allocation_unit,
+                                                   &bytes_per_sector);
+                if (NT_STATUS_IS_OK(status)) {
 
                         /* ... then provide it */
@@ -422 +413 @@
                 uint64_t free_file_nodes;
                 uint64_t fs_identifier;
+                NTSTATUS status;
 
                 /* Has UNIXCIFS. If POSIX filesystem info is available... */
-                if (cli_get_posix_fs_info(cli,
-                                          &optimal_transfer_size,
-                                          &block_size,
-                                          &total_blocks,
-                                          &blocks_available,
-                                          &user_blocks_available,
-                                          &total_file_nodes,
-                                          &free_file_nodes,
-                                          &fs_identifier)) {
+                status = cli_get_posix_fs_info(cli,
+                                               &optimal_transfer_size,
+                                               &block_size,
+                                               &total_blocks,
+                                               &blocks_available,
+                                               &user_blocks_available,
+                                               &total_file_nodes,
+                                               &free_file_nodes,
+                                               &fs_identifier);
+                if (NT_STATUS_IS_OK(status)) {
 
                         /* ... then what's provided here takes precedence. */
@@ -455 +448 @@
 
         /* See if the share is case sensitive */
-        if (!cli_get_fs_attr_info(cli, &fs_attrs)) {
+        if (!NT_STATUS_IS_OK(cli_get_fs_attr_info(cli, &fs_attrs))) {
                 /*
                  * We can't determine the case sensitivity of