summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
Diffstat (limited to 'server')
-rw-r--r--server/alias.c8
-rw-r--r--server/ether.c16
-rw-r--r--server/group.c14
-rw-r--r--server/passwd.c15
-rw-r--r--server/protocol.c14
-rw-r--r--server/rpc.c10
-rw-r--r--server/service.c10
-rw-r--r--server/shadow.c10
8 files changed, 48 insertions, 49 deletions
diff --git a/server/alias.c b/server/alias.c
index 7d39fa6..04cf6b6 100644
--- a/server/alias.c
+++ b/server/alias.c
@@ -72,9 +72,9 @@ static int write_alias(LDAPMessage *e,struct ldap_state *pvt,FILE *fp)
}
-/* macros for expanding the LDF_ALIAS macro */
-#define LDF_STRING(field) WRITE_STRING(fp,field)
-#define LDF_STRINGLIST(field) WRITE_STRINGLIST_NUM(fp,field,result.alias_members_len)
+/* macros for expanding the NSLCD_ALIAS macro */
+#define NSLCD_STRING(field) WRITE_STRING(fp,field)
+#define NSLCD_STRINGLIST(field) WRITE_STRINGLIST_NUM(fp,field,result.alias_members_len)
#define ALIAS_NAME result.alias_name
#define ALIAS_RCPTS result.alias_members
@@ -124,7 +124,7 @@ int nslcd_alias_all(FILE *fp)
{
/* write the result */
WRITE_INT32(fp,retv);
- LDF_ALIAS;
+ NSLCD_ALIAS;
}
/* write the final result code */
WRITE_INT32(fp,retv);
diff --git a/server/ether.c b/server/ether.c
index 9d96b2e..6efbf9c 100644
--- a/server/ether.c
+++ b/server/ether.c
@@ -78,11 +78,11 @@ static int write_ether(LDAPMessage *e,struct ldap_state *pvt,FILE *fp)
{
int stat;
char buffer[1024];
- /* write LDF_STRING(ETHER_NAME) */
+ /* write NSLCD_STRING(ETHER_NAME) */
stat=_nss_ldap_write_attrval(fp,e,ATM(LM_ETHERS,cn));
if (stat!=NSLCD_RESULT_SUCCESS)
return stat;
- /* write LDF_TYPE(ETHER_ADDR,u_int8_t[6]) */
+ /* write NSLCD_TYPE(ETHER_ADDR,u_int8_t[6]) */
stat=_nss_ldap_write_attrval_ether(fp,e,AT(macAddress));
stat = _nss_ldap_assign_attrval (e, AT (macAddress), &saddr,
@@ -120,9 +120,9 @@ _nss_ldap_parse_ether (LDAPMessage * e,
return NSS_STATUS_SUCCESS;
}
-/* macros for expanding the LDF_ETHER macro */
-#define LDF_STRING(field) WRITE_STRING(fp,field)
-#define LDF_TYPE(field,type) WRITE_TYPE(fp,field,type)
+/* macros for expanding the NSLCD_ETHER macro */
+#define NSLCD_STRING(field) WRITE_STRING(fp,field)
+#define NSLCD_TYPE(field,type) WRITE_TYPE(fp,field,type)
#define ETHER_NAME result.e_name
#define ETHER_ADDR result.e_addr
@@ -154,7 +154,7 @@ int nslcd_ether_byname(FILE *fp)
WRITE_INT32(fp,retv);
if (retv==NSLCD_RESULT_SUCCESS)
{
- LDF_ETHER;
+ NSLCD_ETHER;
}
WRITE_FLUSH(fp);
/* we're done */
@@ -189,7 +189,7 @@ int nslcd_ether_byether(FILE *fp)
WRITE_INT32(fp,retv);
if (retv==NSLCD_RESULT_SUCCESS)
{
- LDF_ETHER;
+ NSLCD_ETHER;
}
WRITE_FLUSH(fp);
/* we're done */
@@ -218,7 +218,7 @@ int nslcd_ether_all(FILE *fp)
{
/* write the result */
WRITE_INT32(fp,retv);
- LDF_ETHER;
+ NSLCD_ETHER;
}
/* write the final result code */
WRITE_INT32(fp,retv);
diff --git a/server/group.c b/server/group.c
index a23a8b2..5442a5e 100644
--- a/server/group.c
+++ b/server/group.c
@@ -1048,10 +1048,10 @@ static enum nss_status group_bymember(const char *user, long int *start,
return NSS_STATUS_SUCCESS;
}
-/* macros for expanding the LDF_GROUP macro */
-#define LDF_STRING(field) WRITE_STRING(fp,field)
-#define LDF_TYPE(field,type) WRITE_TYPE(fp,field,type)
-#define LDF_STRINGLIST(field) WRITE_STRINGLIST_NULLTERM(fp,field)
+/* macros for expanding the NSLCD_GROUP macro */
+#define NSLCD_STRING(field) WRITE_STRING(fp,field)
+#define NSLCD_TYPE(field,type) WRITE_TYPE(fp,field,type)
+#define NSLCD_STRINGLIST(field) WRITE_STRINGLIST_NULLTERM(fp,field)
#define GROUP_NAME result.gr_name
#define GROUP_PASSWD result.gr_passwd
#define GROUP_GID result.gr_gid
@@ -1091,7 +1091,7 @@ int nslcd_group_byname(FILE *fp)
WRITE_INT32(fp,retv);
if (retv==NSLCD_RESULT_SUCCESS)
{
- LDF_GROUP;
+ NSLCD_GROUP;
}
WRITE_FLUSH(fp);
/* we're done */
@@ -1130,7 +1130,7 @@ int nslcd_group_bygid(FILE *fp)
WRITE_INT32(fp,retv);
if (retv==NSLCD_RESULT_SUCCESS)
{
- LDF_GROUP;
+ NSLCD_GROUP;
}
WRITE_FLUSH(fp);
/* we're done */
@@ -1218,7 +1218,7 @@ int nslcd_group_all(FILE *fp)
{
/* write the result */
WRITE_INT32(fp,retv);
- LDF_GROUP;
+ NSLCD_GROUP;
}
/* write the final result code */
WRITE_INT32(fp,retv);
diff --git a/server/passwd.c b/server/passwd.c
index c1d3520..1ee6742 100644
--- a/server/passwd.c
+++ b/server/passwd.c
@@ -59,8 +59,6 @@
#endif
-static struct ent_context *pw_context = NULL;
-
static inline enum nss_status _nss_ldap_assign_emptystring(
char **valptr, char **buffer, size_t * buflen)
{
@@ -187,9 +185,9 @@ static enum nss_status _nss_ldap_parse_pw (LDAPMessage * e,
return NSS_STATUS_SUCCESS;
}
-/* macros for expanding the LDF_PASSWD macro */
-#define LDF_STRING(field) WRITE_STRING(fp,field)
-#define LDF_TYPE(field,type) WRITE_TYPE(fp,field,type)
+/* macros for expanding the NSLCD_PASSWD macro */
+#define NSLCD_STRING(field) WRITE_STRING(fp,field)
+#define NSLCD_TYPE(field,type) WRITE_TYPE(fp,field,type)
#define PASSWD_NAME result.pw_name
#define PASSWD_PASSWD result.pw_passwd
#define PASSWD_UID result.pw_uid
@@ -227,7 +225,7 @@ int nslcd_passwd_byname(FILE *fp)
WRITE_INT32(fp,retv);
if (retv==NSLCD_RESULT_SUCCESS)
{
- LDF_PASSWD;
+ NSLCD_PASSWD;
}
WRITE_FLUSH(fp);
/* we're done */
@@ -259,7 +257,7 @@ int nslcd_passwd_byuid(FILE *fp)
WRITE_INT32(fp,retv);
if (retv==NSLCD_RESULT_SUCCESS)
{
- LDF_PASSWD;
+ NSLCD_PASSWD;
}
WRITE_FLUSH(fp);
/* we're done */
@@ -270,6 +268,7 @@ int nslcd_passwd_all(FILE *fp)
{
int32_t tmpint32;
/* these are here for now until we rewrite the LDAP code */
+ struct ent_context *pw_context = NULL;
struct passwd result;
char buffer[1024];
int errnop;
@@ -287,7 +286,7 @@ int nslcd_passwd_all(FILE *fp)
{
/* write the result */
WRITE_INT32(fp,retv);
- LDF_PASSWD;
+ NSLCD_PASSWD;
}
/* write the final result code */
WRITE_INT32(fp,retv);
diff --git a/server/protocol.c b/server/protocol.c
index 0c201fd..9089156 100644
--- a/server/protocol.c
+++ b/server/protocol.c
@@ -86,10 +86,10 @@ static enum nss_status _nss_ldap_parse_proto (LDAPMessage *e,
return NSS_STATUS_SUCCESS;
}
-/* macros for expanding the LDF_PROTOCOL macro */
-#define LDF_STRING(field) WRITE_STRING(fp,field)
-#define LDF_STRINGLIST(field) WRITE_STRINGLIST_NULLTERM(fp,field)
-#define LDF_INT32(field) WRITE_INT32(fp,field)
+/* macros for expanding the NSLCD_PROTOCOL macro */
+#define NSLCD_STRING(field) WRITE_STRING(fp,field)
+#define NSLCD_STRINGLIST(field) WRITE_STRINGLIST_NULLTERM(fp,field)
+#define NSLCD_INT32(field) WRITE_INT32(fp,field)
#define PROTOCOL_NAME result.p_name
#define PROTOCOL_ALIASES result.p_aliases
#define PROTOCOL_NUMBER result.p_proto
@@ -122,7 +122,7 @@ int nslcd_protocol_byname(FILE *fp)
WRITE_INT32(fp,retv);
if (retv==NSLCD_RESULT_SUCCESS)
{
- LDF_PROTOCOL;
+ NSLCD_PROTOCOL;
}
WRITE_FLUSH(fp);
/* we're done */
@@ -155,7 +155,7 @@ int nslcd_protocol_bynumber(FILE *fp)
WRITE_INT32(fp,retv);
if (retv==NSLCD_RESULT_SUCCESS)
{
- LDF_PROTOCOL;
+ NSLCD_PROTOCOL;
}
WRITE_FLUSH(fp);
/* we're done */
@@ -185,7 +185,7 @@ int nslcd_protocol_all(FILE *fp)
/* write the result code */
WRITE_INT32(fp,retv);
/* write the entry */
- LDF_PROTOCOL;
+ NSLCD_PROTOCOL;
}
/* write the final result code */
WRITE_INT32(fp,retv);
diff --git a/server/rpc.c b/server/rpc.c
index 727f722..2da1a6b 100644
--- a/server/rpc.c
+++ b/server/rpc.c
@@ -58,10 +58,10 @@
#include "common.h"
#include "log.h"
-/* macros for expanding the LDF_RPC macro */
-#define LDF_STRING(field) WRITE_STRING(fp,field)
-#define LDF_STRINGLIST(field) WRITE_STRINGLIST_NULLTERM(fp,field)
-#define LDF_INT32(field) WRITE_INT32(fp,field)
+/* macros for expanding the NSLCD_RPC macro */
+#define NSLCD_STRING(field) WRITE_STRING(fp,field)
+#define NSLCD_STRINGLIST(field) WRITE_STRINGLIST_NULLTERM(fp,field)
+#define NSLCD_INT32(field) WRITE_INT32(fp,field)
#define RPC_NAME result->r_name
#define RPC_ALIASES result->r_aliases
#define RPC_NUMBER result->r_number
@@ -70,7 +70,7 @@
static int write_rpcent(FILE *fp,struct rpcent *result)
{
int32_t tmpint32,tmp2int32,tmp3int32;
- LDF_RPC;
+ NSLCD_RPC;
return 0;
}
diff --git a/server/service.c b/server/service.c
index 3133ae5..118f5c5 100644
--- a/server/service.c
+++ b/server/service.c
@@ -58,10 +58,10 @@
#include "common.h"
#include "log.h"
-/* macros for expanding the LDF_SERVICE macro */
-#define LDF_STRING(field) WRITE_STRING(fp,field)
-#define LDF_STRINGLIST(field) WRITE_STRINGLIST_NULLTERM(fp,field)
-#define LDF_INT32(field) WRITE_INT32(fp,field)
+/* macros for expanding the NSLCD_SERVICE macro */
+#define NSLCD_STRING(field) WRITE_STRING(fp,field)
+#define NSLCD_STRINGLIST(field) WRITE_STRINGLIST_NULLTERM(fp,field)
+#define NSLCD_INT32(field) WRITE_INT32(fp,field)
#define SERVICE_NAME result->s_name
#define SERVICE_ALIASES result->s_aliases
#define SERVICE_NUMBER htons(result->s_port)
@@ -71,7 +71,7 @@
static int write_servent(FILE *fp,struct servent *result)
{
int32_t tmpint32,tmp2int32,tmp3int32;
- LDF_SERVICE;
+ NSLCD_SERVICE;
return 0;
}
diff --git a/server/shadow.c b/server/shadow.c
index c607efb..bb2141b 100644
--- a/server/shadow.c
+++ b/server/shadow.c
@@ -107,9 +107,9 @@ static enum nss_status _nss_ldap_parse_sp(LDAPMessage *e,
return NSS_STATUS_SUCCESS;
}
-/* macros for expanding the LDF_SHADOW macro */
-#define LDF_STRING(field) WRITE_STRING(fp,field)
-#define LDF_INT32(field) WRITE_INT32(fp,field)
+/* macros for expanding the NSLCD_SHADOW macro */
+#define NSLCD_STRING(field) WRITE_STRING(fp,field)
+#define NSLCD_INT32(field) WRITE_INT32(fp,field)
#define SHADOW_NAME result.sp_namp
#define SHADOW_PASSWD result.sp_pwdp
#define SHADOW_LASTCHANGE result.sp_lstchg
@@ -147,7 +147,7 @@ int nslcd_shadow_byname(FILE *fp)
WRITE_INT32(fp,retv);
if (retv==NSLCD_RESULT_SUCCESS)
{
- LDF_SHADOW;
+ NSLCD_SHADOW;
}
WRITE_FLUSH(fp);
/* we're done */
@@ -176,7 +176,7 @@ int nslcd_shadow_all(FILE *fp)
{
/* write the result */
WRITE_INT32(fp,retv);
- LDF_SHADOW;
+ NSLCD_SHADOW;
}
/* write the final result code */
WRITE_INT32(fp,retv);
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2025-08-18 13:06:11 +0000