Skip to content

Commit

Permalink
Get libinfo to attempt to talk to DS (#357)
Browse files Browse the repository at this point in the history 
Many xpc functions related to talking to DirectoryService
are stubs, so this won’t work. This does get it to attempt
talking to DirectoryService, however.
  • Loading branch information
Andrew Hyatt committed Dec 17, 2018
1 parent 0a52746 commit b6daf31
Show file tree
Hide file tree
Showing 28 changed files with 40 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/external/DirectoryService
Submodule DirectoryService updated 6 files
+0 −0 include/DirectoryService/DirServices.h
+0 −0 include/DirectoryService/DirServicesConst.h
+0 −0 include/DirectoryService/DirServicesCustom.h
+0 −0 include/DirectoryService/DirServicesTypes.h
+0 −0 include/DirectoryService/DirServicesUtils.h
+0 −0 include/DirectoryService/DirectoryService.h
2 changes: 1 addition & 1 deletion src/external/libxpc
Submodule libxpc updated 2 files
+5 −0 xpc/private.h
+15 −1 xpc_misc.c
4 changes: 4 additions & 0 deletions src/libinfo/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ add_definitions(-DHAVE_STDINT_H=1)
add_definitions(-D__APPLE__ -D__DYNAMIC__)
add_definitions(-D__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=1080)

add_definitions(-DDS_AVAILABLE)

set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -nostdinc -D__DARWIN_UNIX03 -fPIC -ggdb")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -nostdlib")

Expand Down Expand Up @@ -67,9 +69,11 @@ add_circular(system_info FAT
system_pthread
libdispatch_shared
system_notify
system_asl
platform
xpc
compiler_rt
launch
DEPENDENCIES
resolv-darwin
)
Expand Down
1 change: 1 addition & 0 deletions src/opendirectory/include/opendirectory/CAuditUtils.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../external/DirectoryService/include/CAuditUtils.h
1 change: 1 addition & 0 deletions src/opendirectory/include/opendirectory/CHandlers.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../external/DirectoryService/include/CHandlers.h
1 change: 1 addition & 0 deletions src/opendirectory/include/opendirectory/CInternalDispatch.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../external/DirectoryService/include/CInternalDispatch.h
1 change: 1 addition & 0 deletions src/opendirectory/include/opendirectory/CLauncher.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../external/DirectoryService/include/CLauncher.h
1 change: 1 addition & 0 deletions src/opendirectory/include/opendirectory/CNodeList.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../external/DirectoryService/include/CNodeList.h
1 change: 1 addition & 0 deletions src/opendirectory/include/opendirectory/CPlugInList.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../external/DirectoryService/include/CPlugInList.h
1 change: 1 addition & 0 deletions src/opendirectory/include/opendirectory/CPluginConfig.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../external/DirectoryService/include/CPluginConfig.h
1 change: 1 addition & 0 deletions src/opendirectory/include/opendirectory/CPluginHandler.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../external/DirectoryService/include/CPluginHandler.h
1 change: 1 addition & 0 deletions src/opendirectory/include/opendirectory/CRefTable.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../external/DirectoryService/include/CRefTable.h
1 change: 1 addition & 0 deletions src/opendirectory/include/opendirectory/CServerPlugin.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../external/DirectoryService/include/CServerPlugin.h
1 change: 1 addition & 0 deletions src/opendirectory/include/opendirectory/CSrvrMessaging.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../external/DirectoryService/include/CSrvrMessaging.h
1 change: 1 addition & 0 deletions src/opendirectory/include/opendirectory/DSMachEndian.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../external/DirectoryService/include/DSMachEndian.h
1 change: 1 addition & 0 deletions src/opendirectory/include/opendirectory/DSSwapUtils.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../external/DirectoryService/include/DSSwapUtils.h
1 change: 1 addition & 0 deletions src/opendirectory/include/opendirectory/DSlibinfoMIG_types.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../external/DirectoryService/include/DSlibinfoMIG_types.h
1 change: 1 addition & 0 deletions src/opendirectory/include/opendirectory/DSmemberdMIG_types.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../external/DirectoryService/include/DSmemberdMIG_types.h
1 change: 1 addition & 0 deletions src/opendirectory/include/opendirectory/DirServiceMain.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../external/DirectoryService/include/DirServiceMain.h
1 change: 1 addition & 0 deletions src/opendirectory/include/opendirectory/DirectoryService
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../external/DirectoryService/include/DirectoryService
1 change: 1 addition & 0 deletions src/opendirectory/include/opendirectory/Mbrd_Cache.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../external/DirectoryService/include/Mbrd_Cache.h
1 change: 1 addition & 0 deletions src/opendirectory/include/opendirectory/Mbrd_HashTable.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../external/DirectoryService/include/Mbrd_HashTable.h
1 change: 1 addition & 0 deletions src/opendirectory/include/opendirectory/Mbrd_MembershipResolver.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../external/DirectoryService/include/Mbrd_MembershipResolver.h
1 change: 1 addition & 0 deletions src/opendirectory/include/opendirectory/Mbrd_UserGroup.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../external/DirectoryService/include/Mbrd_UserGroup.h
1 change: 1 addition & 0 deletions src/opendirectory/include/opendirectory/ServerControl.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../external/DirectoryService/include/ServerControl.h
1 change: 1 addition & 0 deletions src/opendirectory/include/opendirectory/od_passthru.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../external/DirectoryService/include/od_passthru.h
12 changes: 10 additions & 2 deletions src/opendirectory/include/opendirectory/odipc.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
#ifndef _OD_ODIPC_H_
#define _OD_ODIPC_H_

#define kODMachMembershipPortNameDebug 1
#define kODMachMembershipPortName 1
#define kODMachMembershipPortNameDebug 401
#define kODMachMembershipPortName 400

#define kODMachLibinfoPortName 500
#define kODMachLibinfoPortNameDebug 501

#define OD_RPC_NAME "rpc_name"
#define OD_RPC_VERSION "rpc_version"
#define OD_RPC_RESULT "rpc_result"
#define OD_RPC_ERROR "rpc_error"

#endif
1 change: 1 addition & 0 deletions src/opendirectory/include/opendirectory/rb.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../external/DirectoryService/include/rb.h

0 comments on commit b6daf31

Please sign in to comment.