0682 nwnss: keep ndp idbroker app loader out of userspace kernel port
This commit is contained in:
@@ -56,8 +56,10 @@
|
||||
# include <pwd.h>
|
||||
# include <ndp_msg.h>
|
||||
# include <pthread.h>
|
||||
# include <dlfcn.h> /* dlerror(), dlopen(), dlsym(), dlclose() */
|
||||
# include <ndp_app.h>
|
||||
# ifndef MARS_NWE_NWNSS_USERSPACE
|
||||
# include <dlfcn.h> /* dlerror(), dlopen(), dlsym(), dlclose() */
|
||||
# include <ndp_app.h>
|
||||
# endif
|
||||
#endif
|
||||
|
||||
/* Timeout(s) specified in seconds */
|
||||
@@ -554,7 +556,7 @@ void *ndp_idBroker_messagehandler(
|
||||
* Dynamically linked libraries & functions we need
|
||||
*****************************************************************************/
|
||||
|
||||
#ifndef __KERNEL__
|
||||
#if !defined(__KERNEL__) && !defined(MARS_NWE_NWNSS_USERSPACE)
|
||||
|
||||
/* The following is a deriviation of info from Alexander Danoyan */
|
||||
#ifdef __x86_64__
|
||||
@@ -597,14 +599,14 @@ static int (*NCPMapGUIDToUID)
|
||||
static int (*NCPMapUIDToGUID)
|
||||
(const LONG uid, GUID_t *guid) = NULL;
|
||||
|
||||
#endif /* ! __KERNEL__ */
|
||||
#endif /* ! __KERNEL__ && ! MARS_NWE_NWNSS_USERSPACE */
|
||||
|
||||
/*****************************************************************************
|
||||
* Bind dynamically linked libraries & functions we need
|
||||
*****************************************************************************/
|
||||
void ndp_bind_idbroker_functions()
|
||||
{
|
||||
#ifndef __KERNEL__
|
||||
#if !defined(__KERNEL__) && !defined(MARS_NWE_NWNSS_USERSPACE)
|
||||
char *error;
|
||||
|
||||
ndpDbgPrintf(2, "ndp_bind_idbroker_functions(Enter)\n");
|
||||
@@ -724,7 +726,7 @@ void ndp_bind_idbroker_functions()
|
||||
}
|
||||
|
||||
ndpDbgPrintf(2, "ndp_bind_idbroker_functions(Leave)\n");
|
||||
#endif /* ! __KERNEL__ */
|
||||
#endif /* ! __KERNEL__ && ! MARS_NWE_NWNSS_USERSPACE */
|
||||
return;
|
||||
} /* ndp_bind_idbroker_functions() */
|
||||
|
||||
@@ -733,7 +735,7 @@ void ndp_bind_idbroker_functions()
|
||||
*****************************************************************************/
|
||||
void ndp_unbind_idbroker_functions()
|
||||
{
|
||||
#ifndef __KERNEL__
|
||||
#if !defined(__KERNEL__) && !defined(MARS_NWE_NWNSS_USERSPACE)
|
||||
ndpDbgPrintf(2, "ndp_unbind_idbroker_functions(Enter)\n");
|
||||
/*
|
||||
* Unbind the PAM/NAM library and the functions we use
|
||||
@@ -763,7 +765,7 @@ void ndp_unbind_idbroker_functions()
|
||||
dlclose(idbroker_handle);
|
||||
}
|
||||
ndpDbgPrintf(2, "ndp_unbind_idbroker_functions(Leave)\n");
|
||||
#endif /* ! __KERNEL__ */
|
||||
#endif /* ! __KERNEL__ && ! MARS_NWE_NWNSS_USERSPACE */
|
||||
return;
|
||||
} /* ndp_unbind_idbroker_functions() */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user