nss-pam-ldapd commit: r1247 - nss-pam-ldapd-solaris/nss
[
Date Prev][
Date Next]
[
Thread Prev][
Thread Next]
nss-pam-ldapd commit: r1247 - nss-pam-ldapd-solaris/nss
- From: Commits of the nss-pam-ldapd project <nss-pam-ldapd-commits [at] lists.arthurdejong.org>
- To: nss-pam-ldapd-commits [at] lists.arthurdejong.org
- Reply-to: nss-pam-ldapd-users [at] lists.arthurdejong.org
- Subject: nss-pam-ldapd commit: r1247 - nss-pam-ldapd-solaris/nss
- Date: Sat, 9 Oct 2010 19:26:33 +0200 (CEST)
Author: tedcheng
Date: Sat Oct 9 19:26:31 2010
New Revision: 1247
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?view=rev&revision=1247
Log:
nss-pam-ldapd fixes for solaris 10 build
Modified:
nss-pam-ldapd-solaris/nss/ethers.c
nss-pam-ldapd-solaris/nss/group.c
nss-pam-ldapd-solaris/nss/netgroup.c
nss-pam-ldapd-solaris/nss/networks.c
nss-pam-ldapd-solaris/nss/passwd.c
nss-pam-ldapd-solaris/nss/protocols.c
nss-pam-ldapd-solaris/nss/rpc.c
nss-pam-ldapd-solaris/nss/services.c
nss-pam-ldapd-solaris/nss/shadow.c
Modified: nss-pam-ldapd-solaris/nss/ethers.c
==============================================================================
--- nss-pam-ldapd-solaris/nss/ethers.c Fri Oct 8 13:56:56 2010 (r1246)
+++ nss-pam-ldapd-solaris/nss/ethers.c Sat Oct 9 19:26:31 2010 (r1247)
@@ -42,6 +42,8 @@
return NSS_STATUS_SUCCESS;
}
+static __thread TFILE *etherentfp;
+
#ifdef NSS_FLAVOUR_GLIBC
/* map a hostname to the corresponding ethernet address */
@@ -67,7 +69,7 @@
}
/* thread-local file pointer to an ongoing request */
-static __thread TFILE *etherentfp;
+/* static __thread TFILE *etherentfp; */
/* open a connection to read all ether entries */
nss_status_t _nss_ldap_setetherent(int UNUSED(stayopen))
@@ -97,7 +99,7 @@
#ifndef NSS_BUFLEN_ETHERS
#define NSS_BUFLEN_ETHERS 1024
-#endif
+#endif /* NSS_BUFLEN_ETHERS */
#define errnop &errno
@@ -159,9 +161,6 @@
return retv;
}
-/* thread-local file pointer to an ongoing request */
-static __thread TFILE *etherentfp;
-
static nss_status_t _xnss_ldap_setetherent(nss_backend_t UNUSED(*be),void
UNUSED(*args))
{
NSS_SETENT(etherentfp);
@@ -169,7 +168,7 @@
static nss_status_t _xnss_ldap_getetherent_r(nss_backend_t UNUSED(*be),void
*args)
{
- /* TODO: cns3 uses struct ether,verify */
+ /* TODO: padl uses struct ether,verify */
struct etherent result;
char *buffer=NSS_ARGS(args)->buf.buffer;
size_t buflen=NSS_ARGS(args)->buf.buflen;
Modified: nss-pam-ldapd-solaris/nss/group.c
==============================================================================
--- nss-pam-ldapd-solaris/nss/group.c Fri Oct 8 13:56:56 2010 (r1246)
+++ nss-pam-ldapd-solaris/nss/group.c Sat Oct 9 19:26:31 2010 (r1247)
@@ -31,6 +31,8 @@
#include "common.h"
#include "compat/attrs.h"
+static __thread TFILE *grentfp;
+
/* read a single group entry from the stream */
static nss_status_t read_group(
TFILE *fp,struct group *result,
@@ -54,10 +56,8 @@
int32_t res=(int32_t)NSLCD_RESULT_BEGIN;
int32_t tmpint32,tmp2int32,tmp3int32;
gid_t gid;
-#ifdef NSS_FLAVOUR_GLIBC
gid_t *newgroups;
long int newsize;
-#endif /* NSS_FLAVOUR_GLIBC */
/* loop over results */
while (res==(int32_t)NSLCD_RESULT_BEGIN)
{
@@ -130,7 +130,7 @@
}
/* thread-local file pointer to an ongoing request */
-static __thread TFILE *grentfp;
+/* static __thread TFILE *grentfp; */
/* start a request to read all groups */
nss_status_t _nss_ldap_setgrent(int UNUSED(stayopen))
@@ -277,9 +277,6 @@
return status;
}
-/* thread-local file pointer to an ongoing request */
-static __thread TFILE *grentfp;
-
static nss_status_t _xnss_ldap_setgrent(nss_backend_t UNUSED(*be),void
UNUSED(*args))
{
NSS_SETENT(grentfp);
Modified: nss-pam-ldapd-solaris/nss/netgroup.c
==============================================================================
--- nss-pam-ldapd-solaris/nss/netgroup.c Fri Oct 8 13:56:56 2010
(r1246)
+++ nss-pam-ldapd-solaris/nss/netgroup.c Sat Oct 9 19:26:31 2010
(r1247)
@@ -39,6 +39,8 @@
fp=NULL; \
return NSS_STATUS_RETURN;
+static __thread TFILE *netgrentfp;
+
/* function for reading a single result entry */
static nss_status_t read_netgrent(
TFILE *fp,struct __netgrent *result,
@@ -90,7 +92,7 @@
#ifdef NSS_FLAVOUR_GLIBC
/* thread-local file pointer to an ongoing request */
-static __thread TFILE *netgrentfp;
+/* static __thread TFILE *netgrentfp; */
/* start a request to get a netgroup by name */
nss_status_t _nss_ldap_setnetgrent(
@@ -189,9 +191,6 @@
return group;
}
-/* thread-local file pointer to an ongoing request */
-static __thread TFILE *netgrentfp;
-
static nss_status_t _nss_nslcd_getnetgrent_r(struct __netgrent *result,char
*buffer,size_t buflen,int *errnop)
{
NSS_GETENT(netgrentfp,NSLCD_ACTION_NETGROUP_BYNAME,buffer,buflen,
@@ -199,7 +198,7 @@
return retv;
}
-static nss_status_t _nss_nslcd_setnetgrent(const char *group,struct __netgrent
UNUSED(*result))
+static nss_status_t _nss_nslcd_setnetgrent(const char *group,struct __netgrent
UNUSED(* result))
{
/* we cannot use NSS_SETENT() here because we have a parameter that is only
available in this function */
Modified: nss-pam-ldapd-solaris/nss/networks.c
==============================================================================
--- nss-pam-ldapd-solaris/nss/networks.c Fri Oct 8 13:56:56 2010
(r1246)
+++ nss-pam-ldapd-solaris/nss/networks.c Sat Oct 9 19:26:31 2010
(r1247)
@@ -61,6 +61,9 @@
#define ERROR_OUT_WRITEERROR(fp) \
ERROR_OUT_READERROR(fp)
+/* thread-local file pointer to an ongoing request */
+static __thread TFILE *netentfp;
+
/* read a single network entry from the stream, ignoring entries
that are not AF_INET (IPv4), result is stored in result */
static nss_status_t read_netent(
@@ -137,7 +140,7 @@
}
/* thread-local file pointer to an ongoing request */
-static __thread TFILE *netentfp;
+/* static __thread TFILE *netentfp; */
/* start a request to read all networks */
nss_status_t _nss_ldap_setnetent(int UNUSED(stayopen))
@@ -179,6 +182,7 @@
{
struct netent priv_network;
struct netent *network=NSS_ARGS(args)->buf.result?(struct netent
*)NSS_ARGS(args)->buf.result:&priv_network;
+ char *name=(char *)NSS_ARGS(args)->key.name;
int af=NSS_ARGS(args)->key.netaddr.type;
char *buffer=NSS_ARGS(args)->buf.buffer;
size_t buflen=NSS_ARGS(args)->buf.buflen;
@@ -190,7 +194,7 @@
NSS_ARGS(args)->erange=1;
return NSS_STATUS_TRYAGAIN;
}
- status=_nss_nslcd_getnetbyname_r(NSS_ARGS(args)->key.name,network,buffer,
+ status=_nss_nslcd_getnetbyname_r(name,network,buffer,
buflen,&errno,&h_errno);
if (status!=NSS_STATUS_SUCCESS)
{
@@ -200,8 +204,10 @@
if (!NSS_ARGS(args)->buf.result)
{
/* result==NULL, return file format */
+ struct in_addr priv_in_addr;
+ priv_in_addr.s_addr = network->n_net;
data_ptr=(char *)malloc(buflen);
- sprintf(data_ptr,"%s %s",network->n_name,inet_ntoa(network->n_net)); /*
ipNetworkNumber */
+ sprintf(data_ptr,"%s %s",name,inet_ntoa(priv_in_addr)); /* ipNetworkNumber
*/
if (network->n_aliases)
{
int i;
@@ -290,9 +296,6 @@
return status;
}
-/* thread-local file pointer to an ongoing request */
-static __thread TFILE *netentfp;
-
static nss_status_t _xnss_ldap_setnetent(nss_backend_t UNUSED(*be),void
UNUSED(*args))
{
NSS_SETENT(netentfp);
@@ -316,6 +319,7 @@
int h_errno;
char *data_ptr;
nss_status_t status;
+
if (NSS_ARGS(args)->buf.buflen<0)
{
NSS_ARGS(args)->erange=1;
@@ -327,9 +331,11 @@
if (!NSS_ARGS(args)->buf.result)
{
/* result==NULL, return file format */
+ struct in_addr priv_in_addr;
+ priv_in_addr.s_addr = network->n_net;
data_ptr=(char *)malloc(buflen);
sprintf(data_ptr,"%s %s",network->n_name,
- inet_ntoa(network->n_net)); /* ipNetworkNumber */
+ inet_ntoa(priv_in_addr)); /* ipNetworkNumber */
if (network->n_aliases)
{
int i;
Modified: nss-pam-ldapd-solaris/nss/passwd.c
==============================================================================
--- nss-pam-ldapd-solaris/nss/passwd.c Fri Oct 8 13:56:56 2010 (r1246)
+++ nss-pam-ldapd-solaris/nss/passwd.c Sat Oct 9 19:26:31 2010 (r1247)
@@ -30,6 +30,9 @@
#include "common.h"
#include "compat/attrs.h"
+/* thread-local file pointer to an ongoing request */
+static __thread TFILE *pwentfp;
+
/* read a passwd entry from the stream */
static nss_status_t read_passwd(
TFILE *fp,struct passwd *result,
@@ -72,7 +75,7 @@
}
/* thread-local file pointer to an ongoing request */
-static __thread TFILE *pwentfp;
+/* static __thread TFILE *pwentfp; */
/* open a connection to read all passwd entries */
nss_status_t _nss_ldap_setpwent(int UNUSED(stayopen))
@@ -158,9 +161,6 @@
return retv;
}
-/* thread-local file pointer to an ongoing request */
-static __thread TFILE *pwentfp;
-
/* open a connection to the nslcd and write the request */
static nss_status_t _xnss_ldap_setpwent(nss_backend_t UNUSED(*be),void
UNUSED(*args))
{
Modified: nss-pam-ldapd-solaris/nss/protocols.c
==============================================================================
--- nss-pam-ldapd-solaris/nss/protocols.c Fri Oct 8 13:56:56 2010
(r1246)
+++ nss-pam-ldapd-solaris/nss/protocols.c Sat Oct 9 19:26:31 2010
(r1247)
@@ -30,6 +30,9 @@
#include "common.h"
#include "compat/attrs.h"
+/* thread-local file pointer to an ongoing request */
+static __thread TFILE *protoentfp;
+
/* read a single protocol entry from the stream */
static nss_status_t read_protoent(
TFILE *fp,struct protoent *result,
@@ -68,7 +71,7 @@
}
/* thread-local file pointer to an ongoing request */
-static __thread TFILE *protoentfp;
+/* static __thread TFILE *protoentfp; */
/* start a request to read all protocol entries */
nss_status_t _nss_ldap_setprotoent(int UNUSED(stayopen))
@@ -203,9 +206,6 @@
return status;
}
-/* thread-local file pointer to an ongoing request */
-static __thread TFILE *protoentfp;
-
static nss_status_t _xnss_ldap_setprotoent(nss_backend_t UNUSED(*be),void
UNUSED(*args))
{
NSS_SETENT(protoentfp);
Modified: nss-pam-ldapd-solaris/nss/rpc.c
==============================================================================
--- nss-pam-ldapd-solaris/nss/rpc.c Fri Oct 8 13:56:56 2010 (r1246)
+++ nss-pam-ldapd-solaris/nss/rpc.c Sat Oct 9 19:26:31 2010 (r1247)
@@ -30,6 +30,9 @@
#include "common.h"
#include "compat/attrs.h"
+/* thread-local file pointer to an ongoing request */
+static __thread TFILE *protoentfp;
+
/* read a sinlge rpc entry from the stream */
static nss_status_t read_rpcent(
TFILE *fp,struct rpcent *result,
@@ -68,7 +71,7 @@
}
/* thread-local file pointer to an ongoing request */
-static __thread TFILE *protoentfp;
+/* static __thread TFILE *protoentfp; */
/* request a stream to list all rpc entries */
nss_status_t _nss_ldap_setrpcent(int UNUSED(stayopen))
@@ -116,9 +119,6 @@
return retv;
}
-/* thread-local file pointer to an ongoing request */
-static __thread TFILE *protoentfp;
-
static nss_status_t _xnss_ldap_setrpcent(nss_backend_t UNUSED(*be),void
UNUSED(*args))
{
NSS_SETENT(protoentfp);
Modified: nss-pam-ldapd-solaris/nss/services.c
==============================================================================
--- nss-pam-ldapd-solaris/nss/services.c Fri Oct 8 13:56:56 2010
(r1246)
+++ nss-pam-ldapd-solaris/nss/services.c Sat Oct 9 19:26:31 2010
(r1247)
@@ -30,6 +30,9 @@
#include "common.h"
#include "compat/attrs.h"
+/* thread-local file pointer to an ongoing request */
+static __thread TFILE *protoentfp;
+
/* read a single services result entry from the stream */
static nss_status_t read_servent(
TFILE *fp,struct servent *result,
@@ -72,12 +75,12 @@
}
/* thread-local file pointer to an ongoing request */
-static __thread TFILE *serventfp;
+/* static __thread TFILE *protoentfp; */
/* open request to get all services */
nss_status_t _nss_ldap_setservent(int UNUSED(stayopen))
{
- NSS_SETENT(serventfp);
+ NSS_SETENT(protoentfp);
}
/* read a single returned service definition */
@@ -85,15 +88,15 @@
struct servent *result,
char *buffer,size_t buflen,int *errnop)
{
- NSS_GETENT(serventfp,NSLCD_ACTION_SERVICE_ALL,buffer,buflen,
- read_servent(serventfp,result,buffer,buflen,errnop));
+ NSS_GETENT(protoentfp,NSLCD_ACTION_SERVICE_ALL,buffer,buflen,
+ read_servent(protoentfp,result,buffer,buflen,errnop));
return retv;
}
/* close the stream opened by setservent() above */
nss_status_t _nss_ldap_endservent(void)
{
- NSS_ENDENT(serventfp);
+ NSS_ENDENT(protoentfp);
}
#endif /* NSS_FLAVOUR_GLIBC */
@@ -120,25 +123,22 @@
return retv;
}
-/* thread-local file pointer to an ongoing request */
-static __thread TFILE *serventfp;
-
static nss_status_t _xnss_ldap_setservent(nss_backend_t UNUSED(*be),void
UNUSED(*args))
{
- NSS_SETENT(serventfp);
+ NSS_SETENT(protoentfp);
}
static nss_status_t _nss_nslcd_getservent_r(
struct servent *result,char *buffer,size_t buflen,int *errnop)
{
- NSS_GETENT(serventfp,NSLCD_ACTION_SERVICE_ALL,buffer,buflen,
- read_servent(serventfp,result,buffer,buflen,errnop));
+ NSS_GETENT(protoentfp,NSLCD_ACTION_SERVICE_ALL,buffer,buflen,
+ read_servent(protoentfp,result,buffer,buflen,errnop));
return retv;
}
static nss_status_t _xnss_ldap_endservent(nss_backend_t UNUSED(*be),void
UNUSED(*args))
{
- NSS_ENDENT(serventfp);
+ NSS_ENDENT(protoentfp);
}
static nss_status_t _xnss_ldap_getservbyname_r(nss_backend_t UNUSED(*be),void
*args)
Modified: nss-pam-ldapd-solaris/nss/shadow.c
==============================================================================
--- nss-pam-ldapd-solaris/nss/shadow.c Fri Oct 8 13:56:56 2010 (r1246)
+++ nss-pam-ldapd-solaris/nss/shadow.c Sat Oct 9 19:26:31 2010 (r1247)
@@ -30,6 +30,9 @@
#include "common.h"
#include "compat/attrs.h"
+/* thread-local file pointer to an ongoing request */
+static __thread TFILE *spentfp;
+
/* read a single shadow entry from the stream */
static nss_status_t read_spwd(
TFILE *fp,struct spwd *result,
@@ -63,7 +66,7 @@
}
/* thread-local file pointer to an ongoing request */
-static __thread TFILE *spentfp;
+/* static __thread TFILE *spentfp; */
/* start listing all shadow users */
nss_status_t _nss_ldap_setspent(int UNUSED(stayopen))
@@ -108,7 +111,6 @@
char *buffer=NSS_ARGS(args)->buf.buffer;
size_t buflen=NSS_ARGS(args)->buf.buflen;
char *data_ptr;
- char field_buf[128];
nss_status_t status;
if (NSS_ARGS(args)->buf.buflen<0)
{
@@ -122,6 +124,7 @@
{
/* result==NULL, return file format */
data_ptr=(char *)malloc(buflen);
+ char field_buf[128];
sprintf(data_ptr,"%s:%s:",sp->sp_namp,sp->sp_pwdp);
if (sp->sp_lstchg >= 0)
sprintf(field_buf,"%d:",sp->sp_lstchg);
@@ -170,9 +173,6 @@
return status;
}
-/* thread-local file pointer to an ongoing request */
-static __thread TFILE *spentfp;
-
static nss_status_t _xnss_ldap_setspent(nss_backend_t UNUSED(*be),void
UNUSED(*args))
{
NSS_SETENT(spentfp);
--
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits
- nss-pam-ldapd commit: r1247 - nss-pam-ldapd-solaris/nss,
Commits of the nss-pam-ldapd project
