summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur de Jong <arthur@arthurdejong.org>2007-01-17 15:29:17 +0000
committerArthur de Jong <arthur@arthurdejong.org>2007-01-17 15:29:17 +0000
commit971cc42b25ab2b0f014482562c734976915e3033 (patch)
treee99ad7748d05a04a693ac3cf7b66102dfa00542b
parentcf238cb7f0b2eca5e895ea3bf188a6a2f019d0aa (diff)
replace __netgrent with mynetgrent removing the fields that are not used
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-ldapd@221 ef36b2f9-881f-0410-afb5-c4e39611909c
-rw-r--r--nslcd/netgroup.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/nslcd/netgroup.c b/nslcd/netgroup.c
index f404bed..6f14652 100644
--- a/nslcd/netgroup.c
+++ b/nslcd/netgroup.c
@@ -57,7 +57,7 @@
track which netgroups were read and which still have to be read. */
/* Dataset for iterating netgroups. */
-struct __netgrent
+struct mynetgrent
{
enum
{ triple_val, group_val }
@@ -83,15 +83,12 @@ struct __netgrent
size_t data_size;
char *cursor;
int first;
-
- struct name_list *known_groups;
- struct name_list *needed_groups;
};
/*
* I (Luke Howard) pulled the following macro (EXPAND), functions
* (strip_whitespace and _nss_netgroup_parseline) and structures
- * (name_list and __netgrent) from glibc-2.2.x. _nss_netgroup_parseline
+ * (name_list and mynetgrent) from glibc-2.2.x. _nss_netgroup_parseline
* became _nss_ldap_parse_netgr after some modification.
*
* The rest of the code is modeled on various other _nss_ldap functions.
@@ -137,7 +134,7 @@ strip_whitespace (char *str)
static enum nss_status
_nss_ldap_parse_netgr (void *vresultp, char *buffer, size_t buflen)
{
- struct __netgrent *result = (struct __netgrent *) vresultp;
+ struct mynetgrent *result = (struct mynetgrent *) vresultp;
char *cp = result->cursor;
char *user, *host, *domain;
@@ -228,7 +225,7 @@ _nss_ldap_load_netgr (LDAPMessage * e,
int valcount = 0;
char **vals;
char **valiter;
- struct __netgrent *result = vresultp;
+ struct mynetgrent *result = vresultp;
enum nss_status stat = NSS_STATUS_SUCCESS;
for (attr = 0; attr < 2; attr++)
@@ -293,7 +290,7 @@ int nslcd_netgroup_byname(FILE *fp)
static struct ent_context *netgroup_context=NULL;
char name[256];
/* these are here for now until we rewrite the LDAP code */
- struct __netgrent result;
+ struct mynetgrent result;
char buffer[1024];
int errnop;
struct ldap_args a;