Changeset 124 for branches/samba-3.0/source/smbd/trans2.c

Timestamp:

Mar 12, 2008, 9:08:18 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.28a

File:

• branches/samba-3.0/source/smbd/trans2.c (modified) (5 diffs)

branches/samba-3.0/source/smbd/trans2.c

@@ -2234 +2234 @@
 }
 
+static void samba_extended_info_version(struct smb_extended_info *extended_info)
+{
+                                SMB_ASSERT(extended_info != NULL);
+
+                                extended_info->samba_magic = SAMBA_EXTENDED_INFO_MAGIC;
+                                extended_info->samba_version = ((SAMBA_VERSION_MAJOR & 0xff) << 24)
+                                                                                                                                                         | ((SAMBA_VERSION_MINOR & 0xff) << 16)
+                                                                                                                                                         | ((SAMBA_VERSION_RELEASE & 0xff) << 8);
+#ifdef SAMBA_VERSION_REVISION
+                                extended_info->samba_version |= (tolower(*SAMBA_VERSION_REVISION) - 'a' + 1) & 0xff;
+#endif
+                                extended_info->samba_subversion = 0;
+#ifdef SAMBA_VERSION_RC_RELEASE
+                                extended_info->samba_subversion |= (SAMBA_VERSION_RC_RELEASE & 0xff) << 24;
+#else
+#ifdef SAMBA_VERSION_PRE_RELEASE
+                                extended_info->samba_subversion |= (SAMBA_VERSION_PRE_RELEASE & 0xff) << 16;
+#endif
+#endif
+#ifdef SAMBA_VERSION_VENDOR_PATCH
+                                extended_info->samba_subversion |= (SAMBA_VERSION_VENDOR_PATCH & 0xffff);
+#endif
+                                extended_info->samba_subversion = 0;
+#ifdef SAMBA_VERSION_GIT_COMMIT_TIME
+                                unix_to_nt_time(&extended_info->samba_gitcommitdate, SAMBA_VERSION_GIT_COMMIT_TIME);
+#endif
+
+                                memset(extended_info->samba_version_string, 0,
+                                                         sizeof(extended_info->samba_version_string));
+
+                                snprintf (extended_info->samba_version_string,
+                                                                        sizeof(extended_info->samba_version_string),
+                                                                        "%s", samba_version_string());
+}
+
 /****************************************************************************
  Reply to a TRANS2_QFSINFO (query filesystem info).
@@ -2341 +2376 @@
                         SIVAL(pdata,0,FILE_CASE_PRESERVED_NAMES|FILE_CASE_SENSITIVE_SEARCH|
                                 (lp_nt_acl_support(SNUM(conn)) ? FILE_PERSISTENT_ACLS : 0)|
+                                FILE_UNICODE_ON_DISK|
                                 quota_flag); /* FS ATTRIBUTES */
 
@@ -2522 +2558 @@
 #endif /* HAVE_SYS_QUOTAS */
                 case SMB_FS_OBJECTID_INFORMATION:
+                {
+                        /*
+                         * No object id, but we transmit version information.
+                         */
+                        struct smb_extended_info extended_info;
+                        samba_extended_info_version (&extended_info);
+                        SIVAL(pdata,16,extended_info.samba_magic);
+                        SIVAL(pdata,20,extended_info.samba_version);
+                        SIVAL(pdata,24,extended_info.samba_subversion);
+                        SBIG_UINT(pdata,28,extended_info.samba_gitcommitdate);
+                        memcpy(pdata+36,extended_info.samba_version_string,28);
                         data_len = 64;
                         break;
+                }
 
                 /*
@@ -3310 +3358 @@
         }
 
-        nlink = sbuf.st_nlink;
-
-        if ((nlink > 0) && S_ISDIR(sbuf.st_mode)) {
-                /* NTFS does not seem to count ".." */
-                nlink -= 1;
-        }
-
-        if ((nlink > 0) && delete_pending) {
-                nlink -= 1;
-        }
-
         if (INFO_LEVEL_IS_UNIX(info_level) && !lp_unix_extensions()) {
                 return ERROR_NT(NT_STATUS_INVALID_LEVEL);
@@ -3337 +3374 @@
         if (!mode)
                 mode = FILE_ATTRIBUTE_NORMAL;
+
+        nlink = sbuf.st_nlink;
+
+        if (nlink && (mode&aDIR)) {
+                nlink = 1;
+        }
+
+        if ((nlink > 0) && delete_pending) {
+                nlink -= 1;
+        }
 
         fullpathname = fname;