Changeset 57

Timestamp:

Aug 7, 2007, 6:57:41 AM (18 years ago)

Author:

Paul Smedley

Message:

Use os2_isattribute to check for readonly, system, hidden, archive attributes

File:

• trunk/samba/source/smbd/dosmode.c (modified) (3 diffs)

trunk/samba/source/smbd/dosmode.c

@@ -78 +78 @@
         mode_t dir_mode = 0; /* Mode of the inherit_from directory if
                               * inheriting. */
-
         if (!lp_store_dos_attributes(SNUM(conn)) && IS_DOS_READONLY(dosmode)) {
                 result &= ~(S_IWUSR | S_IWGRP | S_IWOTH);
@@ -155 +154 @@
         if (ro_opts == MAP_READONLY_YES) {
                 /* Original Samba method - map inverse of user "w" bit. */
+#ifndef __OS2__
                 if ((sbuf->st_mode & S_IWUSR) == 0) {
+#else
+                if(os2_isattribute(path,aRONLY)==0) {
+#endif
                         result |= aRONLY;
                 }
@@ -164 +167 @@
                 }
         } /* Else never set the readonly bit. */
-
+#ifndef __OS2__
         if (MAP_ARCHIVE(conn) && ((sbuf->st_mode & S_IXUSR) != 0))
+#else
+                if(os2_isattribute(path,aARCH)==0)
+#endif
                 result |= aARCH;
 
+#ifndef __OS2__
         if (MAP_SYSTEM(conn) && ((sbuf->st_mode & S_IXGRP) != 0))
+#else
+                if(os2_isattribute(path,aSYSTEM)==0) 
+#endif
                 result |= aSYSTEM;
         
+#ifndef __OS2__
         if (MAP_HIDDEN(conn) && ((sbuf->st_mode & S_IXOTH) != 0))
+#else
+                if(os2_isattribute(path,aHIDDEN)==0) 
+#endif
                 result |= aHIDDEN;