diff options
-rw-r--r-- | nslcd.h | 8 | ||||
-rw-r--r-- | nslcd/netgroup.c | 4 | ||||
-rw-r--r-- | nss/netgroup.c | 4 |
3 files changed, 8 insertions, 8 deletions
@@ -109,16 +109,16 @@ /* Netgroup NSS request return a number of results. Result values can be either a reference to another netgroup: - INT32 NETGROUP_TYPE_NETGROUP + INT32 NSLCD_NETGROUP_TYPE_NETGROUP STRING other netgroup name or a netgroup triple: - INT32 NETGROUP_TYPE_TRIPLE + INT32 NSLCD_NETGROUP_TYPE_TRIPLE STRING host STRING user STRING domain */ #define NSLCD_ACTION_NETGROUP_BYNAME 12001 -#define NETGROUP_TYPE_NETGROUP 123 -#define NETGROUP_TYPE_TRIPLE 456 +#define NSLCD_NETGROUP_TYPE_NETGROUP 123 +#define NSLCD_NETGROUP_TYPE_TRIPLE 456 /* Network name (/etc/networks) NSS requests. Result values for a single entry are: diff --git a/nslcd/netgroup.c b/nslcd/netgroup.c index bf78b6a..8f380a8 100644 --- a/nslcd/netgroup.c +++ b/nslcd/netgroup.c @@ -186,7 +186,7 @@ static int write_netgroup_triple(TFILE *fp,const char *triple) } /* write strings */ WRITE_INT32(fp,NSLCD_RESULT_BEGIN); - WRITE_INT32(fp,NETGROUP_TYPE_TRIPLE); + WRITE_INT32(fp,NSLCD_NETGROUP_TYPE_TRIPLE); WRITE_STRING_STRIPSPACE_LEN(fp,triple+hostb,hoste-hostb) WRITE_STRING_STRIPSPACE_LEN(fp,triple+userb,usere-userb) WRITE_STRING_STRIPSPACE_LEN(fp,triple+domainb,domaine-domainb) @@ -220,7 +220,7 @@ static int write_netgroup(TFILE *fp,MYLDAP_ENTRY *entry) /* write the result code */ WRITE_INT32(fp,NSLCD_RESULT_BEGIN); /* write triple indicator */ - WRITE_INT32(fp,NETGROUP_TYPE_NETGROUP); + WRITE_INT32(fp,NSLCD_NETGROUP_TYPE_NETGROUP); /* write netgroup name */ WRITE_STRING_STRIPSPACE(fp,members[i]); } diff --git a/nss/netgroup.c b/nss/netgroup.c index 9d82f04..57299ea 100644 --- a/nss/netgroup.c +++ b/nss/netgroup.c @@ -49,13 +49,13 @@ static enum nss_status read_netgrent( size_t bufptr=0; /* read netgroup type */ READ_INT32(fp,type); - if (type==NETGROUP_TYPE_NETGROUP) + if (type==NSLCD_NETGROUP_TYPE_NETGROUP) { /* the response is a reference to another netgroup */ result->type=group_val; READ_STRING_BUF(fp,result->val.group); } - else if (type==NETGROUP_TYPE_TRIPLE) + else if (type==NSLCD_NETGROUP_TYPE_TRIPLE) { /* the response is a host/user/domain triple */ result->type=triple_val; |