diff --git a/slang/ChangeLog b/slang/ChangeLog index 1c3f38152..f0f33a693 100644 --- a/slang/ChangeLog +++ b/slang/ChangeLog @@ -1,3 +1,8 @@ +2005-11-15 Leonard den Ottolander + + * slcommon.c (_pSLsecure_issetugid): Remove dependency on glibc + private function __libc_enable_secure(). + 2005-11-10 Leonard den Ottolander * *: Upgrade slang to 2.0.5. diff --git a/slang/slcommon.c b/slang/slcommon.c index 151fcdf77..a324d0cc6 100644 --- a/slang/slcommon.c +++ b/slang/slcommon.c @@ -191,7 +191,7 @@ char *SLcalloc (unsigned int nelems, unsigned int len) return p; } -#if !defined(HAVE_ISSETUGID) && defined(__GLIBC__) && (__GLIBC__ >= 2) +#if !defined(HAVE_ISSETUGID) && defined(__GLIBC__) && (__GLIBC__ >= 2) && 0 extern int __libc_enable_secure; # define HAVE___LIBC_ENABLE_SECURE 1 #endif @@ -201,7 +201,7 @@ int _pSLsecure_issetugid (void) #ifdef HAVE_ISSETUGID return (1 == issetugid ()); #else -# ifdef HAVE___LIBC_ENABLE_SECURE +# if defined HAVE___LIBC_ENABLE_SECURE && 0 return __libc_enable_secure; # else # if defined(HAVE_GETUID) && defined(HAVE_GETEUID) && defined(HAVE_GETGID) && defined(HAVE_GETEUID)