summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur de Jong <arthur@arthurdejong.org>2006-10-25 15:22:04 +0000
committerArthur de Jong <arthur@arthurdejong.org>2006-10-25 15:22:04 +0000
commit4ba0924ee98e297e5ce526367c6aad204b6c3adc (patch)
tree6fdc9202ebd01dd49be3e78ecc013e2bb31a4b44
parentb586bf84c0bd966abf5cb3d26fa956353d77f9e1 (diff)
move ldap server code into separate directory
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/libnss_ldapd@25 ef36b2f9-881f-0410-afb5-c4e39611909c
-rw-r--r--server/aliases.c (renamed from ldap-alias.c)0
-rw-r--r--server/automount.c (renamed from ldap-automount.c)6
-rw-r--r--server/ethers.c (renamed from ldap-ethers.c)4
-rw-r--r--server/group.c (renamed from ldap-grp.c)33
-rw-r--r--server/hosts.c (renamed from ldap-hosts.c)16
-rw-r--r--server/netgroup.c (renamed from ldap-netgrp.c)13
-rw-r--r--server/networks.c (renamed from ldap-network.c)31
-rw-r--r--server/passwd.c (renamed from ldap-pwd.c)38
-rw-r--r--server/protocols.c (renamed from ldap-proto.c)32
-rw-r--r--server/rpc.c (renamed from ldap-rpc.c)44
-rw-r--r--server/services.c (renamed from ldap-service.c)42
-rw-r--r--server/shadow.c (renamed from ldap-spwd.c)37
12 files changed, 127 insertions, 169 deletions
diff --git a/ldap-alias.c b/server/aliases.c
index 0d9ec33..0d9ec33 100644
--- a/ldap-alias.c
+++ b/server/aliases.c
diff --git a/ldap-automount.c b/server/automount.c
index 5f31ef6..1b7b4cb 100644
--- a/ldap-automount.c
+++ b/server/automount.c
@@ -81,7 +81,7 @@ _nss_ldap_parse_automount (LDAPMessage * e,
return NSS_STATUS_SUCCESS;
}
-enum nss_status
+static enum nss_status
_nss_ldap_am_context_alloc(struct ldap_automount_context **pContext)
{
struct ldap_automount_context *context;
@@ -119,7 +119,7 @@ _nss_ldap_am_context_alloc(struct ldap_automount_context **pContext)
return NSS_STATUS_SUCCESS;
}
-void
+static void
_nss_ldap_am_context_free(struct ldap_automount_context **pContext)
{
struct ldap_automount_context *context;
@@ -196,7 +196,7 @@ am_context_add_dn (LDAPMessage * e,
return NSS_STATUS_SUCCESS;
}
-enum nss_status
+static enum nss_status
_nss_ldap_am_context_init(const char *mapname, struct ldap_automount_context **pContext)
{
enum nss_status stat;
diff --git a/ldap-ethers.c b/server/ethers.c
index 3c2740a..a6dafe9 100644
--- a/ldap-ethers.c
+++ b/server/ethers.c
@@ -122,12 +122,12 @@ _nss_ldap_getntohost_r (struct ether_addr * addr, struct ether * result,
_nss_ldap_parse_ether, LDAP_NSS_BUFLEN_DEFAULT);
}
- enum nss_status _nss_ldap_setetherent (void)
+enum nss_status _nss_ldap_setetherent (void)
{
LOOKUP_SETENT (ether_context);
}
- enum nss_status _nss_ldap_endetherent (void)
+enum nss_status _nss_ldap_endetherent (void)
{
LOOKUP_ENDENT (ether_context);
}
diff --git a/ldap-grp.c b/server/group.c
index 7f0bfe8..7eaf4a4 100644
--- a/ldap-grp.c
+++ b/server/group.c
@@ -893,24 +893,10 @@ ng_chase_backlink (const char ** membersOf, ldap_initgroups_args_t * lia)
return stat;
}
-enum nss_status _nss_ldap_initgroups_dyn (const char *user, gid_t group,
- long int *start, long int *size,
- gid_t ** groupsp, long int limit,
- int *errnop);
-
-enum nss_status
-_nss_ldap_initgroups (const char *user, gid_t group, long int *start,
- long int *size, gid_t * groups, long int limit,
- int *errnop)
-{
- return (_nss_ldap_initgroups_dyn (user, group, start, size, &groups, limit,
- errnop));
-}
#define NSS_LDAP_INITGROUPS_FUNCTION "_nss_ldap_initgroups_dyn"
- enum nss_status
-_nss_ldap_initgroups_dyn (const char *user, gid_t group, long int *start,
+enum nss_status _nss_ldap_initgroups_dyn (const char *user, gid_t group, long int *start,
long int *size, gid_t ** groupsp, long int limit,
int *errnop)
{
@@ -1077,8 +1063,15 @@ _nss_ldap_initgroups_dyn (const char *user, gid_t group, long int *start,
return NSS_STATUS_SUCCESS;
}
-enum nss_status
-_nss_ldap_getgrnam_r (const char *name,
+enum nss_status _nss_ldap_initgroups (const char *user, gid_t group, long int *start,
+ long int *size, gid_t * groups, long int limit,
+ int *errnop)
+{
+ return (_nss_ldap_initgroups_dyn (user, group, start, size, &groups, limit,
+ errnop));
+}
+
+enum nss_status _nss_ldap_getgrnam_r (const char *name,
struct group * result,
char *buffer, size_t buflen, int *errnop)
{
@@ -1086,8 +1079,7 @@ _nss_ldap_getgrnam_r (const char *name,
LM_GROUP, _nss_ldap_parse_gr, LDAP_NSS_BUFLEN_GROUP);
}
-enum nss_status
-_nss_ldap_getgrgid_r (gid_t gid,
+enum nss_status _nss_ldap_getgrgid_r (gid_t gid,
struct group *result,
char *buffer, size_t buflen, int *errnop)
{
@@ -1100,8 +1092,7 @@ enum nss_status _nss_ldap_setgrent (void)
LOOKUP_SETENT (gr_context);
}
-enum nss_status
-_nss_ldap_getgrent_r (struct group *result,
+enum nss_status _nss_ldap_getgrent_r (struct group *result,
char *buffer, size_t buflen, int *errnop)
{
LOOKUP_GETENT (gr_context, result, buffer, buflen, errnop,
diff --git a/ldap-hosts.c b/server/hosts.c
index 4fa535e..935c857 100644
--- a/ldap-hosts.c
+++ b/server/hosts.c
@@ -219,8 +219,7 @@ _nss_ldap_parse_hostv6 (LDAPMessage * e,
}
#endif
-enum nss_status
-_nss_ldap_gethostbyname2_r (const char *name, int af, struct hostent * result,
+enum nss_status _nss_ldap_gethostbyname2_r (const char *name, int af, struct hostent * result,
char *buffer, size_t buflen, int *errnop,
int *h_errnop)
{
@@ -249,8 +248,7 @@ _nss_ldap_gethostbyname2_r (const char *name, int af, struct hostent * result,
return status;
}
-enum nss_status
-_nss_ldap_gethostbyname_r (const char *name, struct hostent * result,
+enum nss_status _nss_ldap_gethostbyname_r (const char *name, struct hostent * result,
char *buffer, size_t buflen, int *errnop,
int *h_errnop)
{
@@ -263,8 +261,7 @@ _nss_ldap_gethostbyname_r (const char *name, struct hostent * result,
errnop, h_errnop);
}
-enum nss_status
-_nss_ldap_gethostbyaddr_r (struct in_addr * addr, int len, int type,
+enum nss_status _nss_ldap_gethostbyaddr_r (struct in_addr * addr, int len, int type,
struct hostent * result, char *buffer,
size_t buflen, int *errnop, int *h_errnop)
{
@@ -298,18 +295,17 @@ _nss_ldap_gethostbyaddr_r (struct in_addr * addr, int len, int type,
return status;
}
- enum nss_status _nss_ldap_sethostent (void)
+enum nss_status _nss_ldap_sethostent (void)
{
LOOKUP_SETENT (hosts_context);
}
- enum nss_status _nss_ldap_endhostent (void)
+enum nss_status _nss_ldap_endhostent (void)
{
LOOKUP_ENDENT (hosts_context);
}
-enum nss_status
-_nss_ldap_gethostent_r (struct hostent * result, char *buffer, size_t buflen,
+enum nss_status _nss_ldap_gethostent_r (struct hostent * result, char *buffer, size_t buflen,
int *errnop, int *h_errnop)
{
enum nss_status status;
diff --git a/ldap-netgrp.c b/server/netgroup.c
index 2f1fd91..b5b93cb 100644
--- a/ldap-netgrp.c
+++ b/server/netgroup.c
@@ -68,7 +68,7 @@ static struct ent_context *_ngbe = NULL;
\
if (result->data == NULL) \
{ \
- stat = NSS_STATUS_UNAVAIL; \
+ stat = NSS_STATUS_UNAVAIL; \
goto out; \
} \
\
@@ -282,8 +282,7 @@ out:
return stat;
}
-enum nss_status
-_nss_ldap_endnetgrent (struct __netgrent * result)
+enum nss_status _nss_ldap_endnetgrent(struct __netgrent *result)
{
if (result->data != NULL)
{
@@ -296,8 +295,7 @@ _nss_ldap_endnetgrent (struct __netgrent * result)
LOOKUP_ENDENT (_ngbe);
}
-enum nss_status
-_nss_ldap_setnetgrent (char *group, struct __netgrent *result)
+enum nss_status _nss_ldap_setnetgrent(char *group,struct __netgrent *result)
{
int errnop = 0, buflen = 0;
char *buffer = (char *) NULL;
@@ -324,9 +322,8 @@ _nss_ldap_setnetgrent (char *group, struct __netgrent *result)
LOOKUP_SETENT (_ngbe);
}
-enum nss_status
-_nss_ldap_getnetgrent_r (struct __netgrent *result,
- char *buffer, size_t buflen, int *errnop)
+enum nss_status _nss_ldap_getnetgrent_r(struct __netgrent *result,
+ char *buffer,size_t buflen,int *errnop)
{
return _nss_ldap_parse_netgr (result, buffer, buflen);
}
diff --git a/ldap-network.c b/server/networks.c
index c2da326..959c531 100644
--- a/ldap-network.c
+++ b/server/networks.c
@@ -91,9 +91,8 @@ _nss_ldap_parse_net (LDAPMessage * e,
return NSS_STATUS_SUCCESS;
}
-enum nss_status
-_nss_ldap_getnetbyname_r (const char *name, struct netent * result,
- char *buffer, size_t buflen, int *errnop,
+enum nss_status _nss_ldap_getnetbyname_r(const char *name,struct netent *result,
+ char *buffer,size_t buflen,int *errnop,
int *herrnop)
{
enum nss_status status;
@@ -116,10 +115,9 @@ _nss_ldap_getnetbyname_r (const char *name, struct netent * result,
return status;
}
-enum nss_status
-_nss_ldap_getnetbyaddr_r (unsigned long addr, int type,
- struct netent * result, char *buffer, size_t buflen,
- int *errnop, int *herrnop)
+enum nss_status _nss_ldap_getnetbyaddr_r(unsigned long addr,int type,
+ struct netent *result,char *buffer,size_t buflen,
+ int *errnop,int *herrnop)
{
struct in_addr in;
char buf[256];
@@ -175,22 +173,15 @@ _nss_ldap_getnetbyaddr_r (unsigned long addr, int type,
return retval;
}
- enum nss_status _nss_ldap_setnetent (void)
+enum nss_status _nss_ldap_setnetent(void)
{
LOOKUP_SETENT (net_context);
}
- enum nss_status _nss_ldap_endnetent (void)
-{
- LOOKUP_ENDENT (net_context);
-}
-
-enum nss_status
-_nss_ldap_getnetent_r (struct netent * result, char *buffer, size_t buflen,
- int *errnop, int *herrnop)
+enum nss_status _nss_ldap_getnetent_r(struct netent *result,char *buffer,size_t buflen,
+ int *errnop,int *herrnop)
{
enum nss_status status;
-
status = _nss_ldap_getent (&net_context,
result,
buffer,
@@ -200,6 +191,10 @@ _nss_ldap_getnetent_r (struct netent * result, char *buffer, size_t buflen,
LM_NETWORKS, _nss_ldap_parse_net);
MAP_H_ERRNO (status, *herrnop);
-
return status;
}
+
+enum nss_status _nss_ldap_endnetent(void)
+{
+ LOOKUP_ENDENT (net_context);
+}
diff --git a/ldap-pwd.c b/server/passwd.c
index 3e48ced..11155a9 100644
--- a/ldap-pwd.c
+++ b/server/passwd.c
@@ -44,8 +44,8 @@
static struct ent_context *pw_context = NULL;
-static inline enum nss_status
-_nss_ldap_assign_emptystring (char **valptr, char **buffer, size_t * buflen)
+static inline enum nss_status _nss_ldap_assign_emptystring(
+ char **valptr, char **buffer, size_t * buflen)
{
if (*buflen < 2)
return NSS_STATUS_TRYAGAIN;
@@ -60,8 +60,8 @@ _nss_ldap_assign_emptystring (char **valptr, char **buffer, size_t * buflen)
return NSS_STATUS_SUCCESS;
}
-enum nss_status
-_nss_ldap_parse_pw (LDAPMessage * e,
+/* FIXME: make this non-static for now for testing purposes */
+enum nss_status _nss_ldap_parse_pw (LDAPMessage * e,
struct ldap_state * pvt,
void *result, char *buffer, size_t buflen)
{
@@ -171,42 +171,36 @@ _nss_ldap_parse_pw (LDAPMessage * e,
return NSS_STATUS_SUCCESS;
}
-enum nss_status
-_nss_ldap_getpwnam_r (const char *name,
- struct passwd * result,
- char *buffer, size_t buflen, int *errnop)
+enum nss_status _nss_ldap_getpwnam_r(const char *name,
+ struct passwd *result,
+ char *buffer,size_t buflen,int *errnop)
{
LOOKUP_NAME (name, result, buffer, buflen, errnop, _nss_ldap_filt_getpwnam,
LM_PASSWD, _nss_ldap_parse_pw, LDAP_NSS_BUFLEN_DEFAULT);
}
-enum nss_status
-_nss_ldap_getpwuid_r (uid_t uid,
+enum nss_status _nss_ldap_getpwuid_r(uid_t uid,
struct passwd *result,
- char *buffer, size_t buflen, int *errnop)
+ char *buffer,size_t buflen,int *errnop)
{
LOOKUP_NUMBER (uid, result, buffer, buflen, errnop, _nss_ldap_filt_getpwuid,
LM_PASSWD, _nss_ldap_parse_pw, LDAP_NSS_BUFLEN_DEFAULT);
}
-enum nss_status
-_nss_ldap_setpwent (void)
+enum nss_status _nss_ldap_setpwent(void)
{
LOOKUP_SETENT (pw_context);
}
-enum nss_status
-_nss_ldap_endpwent (void)
-{
- LOOKUP_ENDENT (pw_context);
-}
-
-enum nss_status
-_nss_ldap_getpwent_r (struct passwd *result,
- char *buffer, size_t buflen, int *errnop)
+enum nss_status _nss_ldap_getpwent_r(struct passwd *result,
+ char *buffer,size_t buflen,int *errnop)
{
LOOKUP_GETENT (pw_context, result, buffer, buflen, errnop,
_nss_ldap_filt_getpwent, LM_PASSWD, _nss_ldap_parse_pw,
LDAP_NSS_BUFLEN_DEFAULT);
}
+enum nss_status _nss_ldap_endpwent(void)
+{
+ LOOKUP_ENDENT (pw_context);
+}
diff --git a/ldap-proto.c b/server/protocols.c
index a2876e2..d601c40 100644
--- a/ldap-proto.c
+++ b/server/protocols.c
@@ -51,9 +51,8 @@
static struct ent_context *proto_context = NULL;
-static enum nss_status
-_nss_ldap_parse_proto (LDAPMessage * e,
- struct ldap_state * pvt,
+static enum nss_status _nss_ldap_parse_proto (LDAPMessage *e,
+ struct ldap_state *pvt,
void *result, char *buffer, size_t buflen)
{
@@ -84,39 +83,36 @@ _nss_ldap_parse_proto (LDAPMessage * e,
return NSS_STATUS_SUCCESS;
}
-enum nss_status
-_nss_ldap_getprotobyname_r (const char *name, struct protoent *result,
- char *buffer, size_t buflen, int *errnop)
+enum nss_status _nss_ldap_getprotobyname_r(const char *name,struct protoent *result,
+ char *buffer,size_t buflen,int *errnop)
{
LOOKUP_NAME (name, result, buffer, buflen, errnop,
_nss_ldap_filt_getprotobyname, LM_PROTOCOLS,
_nss_ldap_parse_proto, LDAP_NSS_BUFLEN_DEFAULT);
}
-enum nss_status
-_nss_ldap_getprotobynumber_r (int number, struct protoent *result,
- char *buffer, size_t buflen, int *errnop)
+enum nss_status _nss_ldap_getprotobynumber_r(int number,struct protoent *result,
+ char *buffer,size_t buflen,int *errnop)
{
LOOKUP_NUMBER (number, result, buffer, buflen, errnop,
_nss_ldap_filt_getprotobynumber, LM_PROTOCOLS,
_nss_ldap_parse_proto, LDAP_NSS_BUFLEN_DEFAULT);
}
- enum nss_status _nss_ldap_setprotoent (void)
+enum nss_status _nss_ldap_setprotoent(void)
{
LOOKUP_SETENT (proto_context);
}
- enum nss_status _nss_ldap_endprotoent (void)
-{
- LOOKUP_ENDENT (proto_context);
-}
-
-enum nss_status
-_nss_ldap_getprotoent_r (struct protoent *result, char *buffer, size_t buflen,
- int *errnop)
+enum nss_status _nss_ldap_getprotoent_r(struct protoent *result,char *buffer,size_t buflen,
+ int *errnop)
{
LOOKUP_GETENT (proto_context, result, buffer, buflen, errnop,
_nss_ldap_filt_getprotoent, LM_PROTOCOLS,
_nss_ldap_parse_proto, LDAP_NSS_BUFLEN_DEFAULT);
}
+
+enum nss_status _nss_ldap_endprotoent(void)
+{
+ LOOKUP_ENDENT (proto_context);
+}
diff --git a/ldap-rpc.c b/server/rpc.c
index 614e707..3a12026 100644
--- a/ldap-rpc.c
+++ b/server/rpc.c
@@ -55,8 +55,7 @@
static struct ent_context *rpc_context = NULL;
-static enum nss_status
-_nss_ldap_parse_rpc (LDAPMessage * e,
+static enum nss_status _nss_ldap_parse_rpc (LDAPMessage * e,
struct ldap_state * pvt,
void *result, char *buffer, size_t buflen)
{
@@ -88,39 +87,36 @@ _nss_ldap_parse_rpc (LDAPMessage * e,
return NSS_STATUS_SUCCESS;
}
-enum nss_status
-_nss_ldap_getrpcbyname_r (const char *name, struct rpcent *result,
- char *buffer, size_t buflen, int *errnop)
+enum nss_status _nss_ldap_getrpcbyname_r(const char *name,struct rpcent *result,
+ char *buffer,size_t buflen,int *errnop)
{
- LOOKUP_NAME (name, result, buffer, buflen, errnop,
- _nss_ldap_filt_getrpcbyname, LM_RPC, _nss_ldap_parse_rpc,
- LDAP_NSS_BUFLEN_DEFAULT);
+ LOOKUP_NAME(name, result, buffer, buflen, errnop,
+ _nss_ldap_filt_getrpcbyname, LM_RPC, _nss_ldap_parse_rpc,
+ LDAP_NSS_BUFLEN_DEFAULT);
}
-enum nss_status
-_nss_ldap_getrpcbynumber_r (int number, struct rpcent *result,
- char *buffer, size_t buflen, int *errnop)
+enum nss_status _nss_ldap_getrpcbynumber_r(int number,struct rpcent *result,
+ char *buffer,size_t buflen,int *errnop)
{
- LOOKUP_NUMBER (number, result, buffer, buflen, errnop,
- _nss_ldap_filt_getrpcbynumber, LM_RPC, _nss_ldap_parse_rpc,
- LDAP_NSS_BUFLEN_DEFAULT);
+ LOOKUP_NUMBER(number, result, buffer, buflen, errnop,
+ _nss_ldap_filt_getrpcbynumber, LM_RPC, _nss_ldap_parse_rpc,
+ LDAP_NSS_BUFLEN_DEFAULT);
}
- enum nss_status _nss_ldap_setrpcent (void)
+enum nss_status _nss_ldap_setrpcent(void)
{
- LOOKUP_SETENT (rpc_context);
+ LOOKUP_SETENT(rpc_context);
}
- enum nss_status _nss_ldap_endrpcent (void)
+enum nss_status _nss_ldap_getrpcent_r(struct rpcent *result,char *buffer,size_t buflen,
+ int *errnop)
{
- LOOKUP_ENDENT (rpc_context);
+ LOOKUP_GETENT(rpc_context,result,buffer,buflen,errnop,
+ _nss_ldap_filt_getrpcent,LM_RPC,_nss_ldap_parse_rpc,
+ LDAP_NSS_BUFLEN_DEFAULT);
}
-enum nss_status
-_nss_ldap_getrpcent_r (struct rpcent *result, char *buffer, size_t buflen,
- int *errnop)
+enum nss_status _nss_ldap_endrpcent(void)
{
- LOOKUP_GETENT (rpc_context, result, buffer, buflen, errnop,
- _nss_ldap_filt_getrpcent, LM_RPC, _nss_ldap_parse_rpc,
- LDAP_NSS_BUFLEN_DEFAULT);
+ LOOKUP_ENDENT(rpc_context);
}
diff --git a/ldap-service.c b/server/services.c
index 6a06b71..ffe9b62 100644
--- a/ldap-service.c
+++ b/server/services.c
@@ -55,12 +55,11 @@
static struct ent_context *serv_context = NULL;
-static enum nss_status
-_nss_ldap_parse_serv (LDAPMessage * e,
- struct ldap_state * state,
- void *result, char *buffer, size_t buflen)
+static enum nss_status _nss_ldap_parse_serv (LDAPMessage *e,
+ struct ldap_state *state,
+ void *result,char *buffer,size_t buflen)
{
- struct servent *service = (struct servent *) result;
+ struct servent *service = (struct servent *)result;
char *port;
enum nss_status stat = NSS_STATUS_SUCCESS;
@@ -171,11 +170,10 @@ _nss_ldap_parse_serv (LDAPMessage * e,
return NSS_STATUS_SUCCESS;
}
-enum nss_status
-_nss_ldap_getservbyname_r (const char *name,
+enum nss_status _nss_ldap_getservbyname_r(const char *name,
const char *proto,
- struct servent * result,
- char *buffer, size_t buflen, int *errnop)
+ struct servent *result,
+ char *buffer,size_t buflen,int *errnop)
{
struct ldap_args a;
@@ -190,11 +188,10 @@ _nss_ldap_getservbyname_r (const char *name,
LM_SERVICES, _nss_ldap_parse_serv);
}
-enum nss_status
-_nss_ldap_getservbyport_r (int port,
+enum nss_status _nss_ldap_getservbyport_r(int port,
const char *proto,
- struct servent * result,
- char *buffer, size_t buflen, int *errnop)
+ struct servent *result,
+ char *buffer,size_t buflen,int *errnop)
{
struct ldap_args a;
@@ -209,21 +206,20 @@ _nss_ldap_getservbyport_r (int port,
LM_SERVICES, _nss_ldap_parse_serv);
}
- enum nss_status _nss_ldap_setservent (void)
+enum nss_status _nss_ldap_setservent(void)
{
- LOOKUP_SETENT (serv_context);
+ LOOKUP_SETENT(serv_context);
}
- enum nss_status _nss_ldap_endservent (void)
+enum nss_status _nss_ldap_getservent_r(struct servent *result,char *buffer,size_t buflen,
+ int *errnop)
{
- LOOKUP_ENDENT (serv_context);
+ LOOKUP_GETENT(serv_context, result, buffer, buflen, errnop,
+ _nss_ldap_filt_getservent, LM_SERVICES,
+ _nss_ldap_parse_serv, LDAP_NSS_BUFLEN_DEFAULT);
}
-enum nss_status
-_nss_ldap_getservent_r (struct servent *result, char *buffer, size_t buflen,
- int *errnop)
+enum nss_status _nss_ldap_endservent(void)
{
- LOOKUP_GETENT (serv_context, result, buffer, buflen, errnop,
- _nss_ldap_filt_getservent, LM_SERVICES,
- _nss_ldap_parse_serv, LDAP_NSS_BUFLEN_DEFAULT);
+ LOOKUP_ENDENT(serv_context);
}
diff --git a/ldap-spwd.c b/server/shadow.c
index 483eef2..5319ade 100644
--- a/ldap-spwd.c
+++ b/server/shadow.c
@@ -48,10 +48,9 @@
static struct ent_context *sp_context = NULL;
-static enum nss_status
-_nss_ldap_parse_sp (LDAPMessage * e,
- struct ldap_state * pvt,
- void *result, char *buffer, size_t buflen)
+static enum nss_status _nss_ldap_parse_sp(LDAPMessage *e,
+ struct ldap_state *pvt,
+ void *result,char *buffer,size_t buflen)
{
struct spwd *sp = (struct spwd *) result;
enum nss_status stat;
@@ -106,32 +105,30 @@ _nss_ldap_parse_sp (LDAPMessage * e,
return NSS_STATUS_SUCCESS;
}
-enum nss_status
-_nss_ldap_getspnam_r (const char *name,
- struct spwd * result,
- char *buffer, size_t buflen, int *errnop)
+enum nss_status _nss_ldap_getspnam_r(const char *name,
+ struct spwd *result,
+ char *buffer,size_t buflen,int *errnop)
{
- LOOKUP_NAME (name, result, buffer, buflen, errnop, _nss_ldap_filt_getspnam,
- LM_SHADOW, _nss_ldap_parse_sp, LDAP_NSS_BUFLEN_DEFAULT);
+ LOOKUP_NAME(name, result, buffer, buflen, errnop, _nss_ldap_filt_getspnam,
+ LM_SHADOW, _nss_ldap_parse_sp, LDAP_NSS_BUFLEN_DEFAULT);
}
-enum nss_status _nss_ldap_setspent (void)
+enum nss_status _nss_ldap_setspent(void)
{
- LOOKUP_SETENT (sp_context);
+ LOOKUP_SETENT(sp_context);
}
-enum nss_status _nss_ldap_endspent (void)
+enum nss_status _nss_ldap_getspent_r(struct spwd *result,
+ char *buffer,size_t buflen,int *errnop)
{
- LOOKUP_ENDENT (sp_context);
+ LOOKUP_GETENT(sp_context, result, buffer, buflen, errnop,
+ _nss_ldap_filt_getspent, LM_SHADOW, _nss_ldap_parse_sp,
+ LDAP_NSS_BUFLEN_DEFAULT);
}
-enum nss_status
-_nss_ldap_getspent_r (struct spwd *result,
- char *buffer, size_t buflen, int *errnop)
+enum nss_status _nss_ldap_endspent(void)
{
- LOOKUP_GETENT (sp_context, result, buffer, buflen, errnop,
- _nss_ldap_filt_getspent, LM_SHADOW, _nss_ldap_parse_sp,
- LDAP_NSS_BUFLEN_DEFAULT);
+ LOOKUP_ENDENT(sp_context);
}
#endif /* HAVE_SHADOW_H */