-

Author: brechtsanders

CMakeLists.txt

@@ -41,14 +41,18 @@ IF(BUILD_SHARED)
   LIST(APPEND LINKTYPES "SHARED")
 ENDIF()
 
+IF(WIN32)
+  SET(WIN32_LIBS -lmpr -lshlwapi)
+ENDIF()
+
 FOREACH(LINKTYPE ${LINKTYPES})
   ADD_LIBRARY(dirtrav_${LINKTYPE} ${LINKTYPE} src/dirtrav.c)
   SET_TARGET_PROPERTIES(dirtrav_${LINKTYPE} PROPERTIES DEFINE_SYMBOL "BUILD_DIRTRAV_DLL")
   SET_TARGET_PROPERTIES(dirtrav_${LINKTYPE} PROPERTIES COMPILE_DEFINITIONS "DIRTRAV_GENERATE;${LINKTYPE};${FORCE_OPENDIR_DEF}")
   SET_TARGET_PROPERTIES(dirtrav_${LINKTYPE} PROPERTIES OUTPUT_NAME dirtrav)
   TARGET_INCLUDE_DIRECTORIES(dirtrav_${LINKTYPE} PRIVATE lib)
   IF(WIN32 AND "${LINKTYPE}" STREQUAL "SHARED")
-    TARGET_LINK_LIBRARIES(dirtrav_${LINKTYPE} -lmpr -lshlwapi)
+    TARGET_LINK_LIBRARIES(dirtrav_${LINKTYPE} ${WIN32_LIBS})
   ENDIF()
   SET(ALLTARGETS ${ALLTARGETS} dirtrav_${LINKTYPE})
 
@@ -59,7 +63,7 @@ FOREACH(LINKTYPE ${LINKTYPES})
     SET_TARGET_PROPERTIES(dirtravw_${LINKTYPE} PROPERTIES OUTPUT_NAME dirtravw)
     TARGET_INCLUDE_DIRECTORIES(dirtravw_${LINKTYPE} PRIVATE lib)
     IF(WIN32 AND "${LINKTYPE}" STREQUAL "SHARED")
-      TARGET_LINK_LIBRARIES(dirtravw_${LINKTYPE} -lmpr -lshlwapi)
+      TARGET_LINK_LIBRARIES(dirtravw_${LINKTYPE} ${WIN32_LIBS})
     ENDIF()
     SET(ALLTARGETS ${ALLTARGETS} dirtravw_${LINKTYPE})
   ENDIF()
@@ -69,7 +73,7 @@ ENDFOREACH()
 
 IF(BUILD_TOOLS)
   IF(WIN32 AND "${EXELINKTYPE}" STREQUAL "STATIC")
-    SET(TOOLS_LIBS -lmpr -lshlwapi)
+    SET(TOOLS_LIBS ${WIN32_LIBS})
   ELSE()
     SET(TOOLS_LIBS)
   ENDIF()

Changelog.txt

@@ -1,3 +1,5 @@
+0.2.24
+
 0.2.23
 
 2025-11-04  Brecht Sanders  https://github.com/brechtsanders/

include/dirtrav_version.h

@@ -47,7 +47,7 @@ THE SOFTWARE.
 /*! \brief minor version number */
 #define DIRTRAV_VERSION_MINOR 2
 /*! \brief micro version number */
-#define DIRTRAV_VERSION_MICRO 23
+#define DIRTRAV_VERSION_MICRO 24
 /*! @} */
 
 /*! \cond PRIVATE */

src/dirtrav.c

@@ -846,7 +846,9 @@ DLL_EXPORT_DIRTRAV DIRCHAR* DIRTRAVFN(prop_get_owner) (DIRTRAVFN(entry) entry)
     }
   }
   if (GetSecurityDescriptorOwner(secdes, &sid, &ownerdefaulted)) {
-    result = sid_to_username(sid, NULL);
+    if (((struct DIRTRAVFN(entry_internal_struct)*)entry)->topinfo->remotehost == DIRTRAV_REMOTE_HOST_NOT_SET)
+      ((struct DIRTRAVFN(entry_internal_struct)*)entry)->topinfo->remotehost = DIRTRAVFN(get_remote_server_from_path)(((struct DIRTRAVFN(entry_internal_struct)*)entry)->topinfo->fullpath);
+    result = sid_to_username(sid, ((struct DIRTRAVFN(entry_internal_struct)*)entry)->topinfo->remotehost);
   }
   free(secdes);
   /////TO DO: GROUP_SECURITY_INFORMATION
@@ -862,9 +864,8 @@ DLL_EXPORT_DIRTRAV DIRCHAR* DIRTRAVFN(prop_get_owner) (DIRTRAVFN(entry) entry)
 
 DLL_EXPORT_DIRTRAV DIRCHAR* DIRTRAVFN(prop_get_remote_server) (DIRTRAVFN(entry) entry)
 {
-  if (((struct DIRTRAVFN(entry_internal_struct)*)entry)->topinfo->remotehost == DIRTRAV_REMOTE_HOST_NOT_SET) {
+  if (((struct DIRTRAVFN(entry_internal_struct)*)entry)->topinfo->remotehost == DIRTRAV_REMOTE_HOST_NOT_SET)
     ((struct DIRTRAVFN(entry_internal_struct)*)entry)->topinfo->remotehost = DIRTRAVFN(get_remote_server_from_path)(((struct DIRTRAVFN(entry_internal_struct)*)entry)->topinfo->fullpath);
-  }
   return ((struct DIRTRAVFN(entry_internal_struct)*)entry)->topinfo->remotehost;
 }