Changeset 862 for trunk/server/source3/lib/system.c

Timestamp:

May 13, 2014, 11:39:04 AM (11 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update trunk to 3.6.23

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/lib/system.c (modified) (2 diffs)

trunk/server/source3/lib/system.c

@@ -888 +888 @@
 
 /*******************************************************************
- An fdopendir wrapper that will deal with 64 bit filesizes.
- Ugly hack - we need dirfd for this to work correctly in the
- calling code.. JRA.
+ An fdopendir wrapper.
 ********************************************************************/
 
 SMB_STRUCT_DIR *sys_fdopendir(int fd)
 {
-#if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_FDOPENDIR64) && defined(HAVE_DIRFD)
+#if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_FDOPENDIR64)
         return fdopendir64(fd);
-#elif defined(HAVE_FDOPENDIR) && defined(HAVE_DIRFD)
+#elif defined(HAVE_FDOPENDIR)
         return fdopendir(fd);
 #else
@@ -1815 +1813 @@
         /* Iterate through extattr(2) namespaces */
         for(t = 0; t < (sizeof(extattr)/sizeof(extattr[0])); t++) {
+                if (t != EXTATTR_NAMESPACE_USER && geteuid() != 0) {
+                        /* ignore all but user namespace when we are not root, see bug 10247 */
+                        continue;
+                }
                 switch(type) {
 #if defined(HAVE_EXTATTR_LIST_FILE)