nss-pam-ldapd commit: r1138 - in nss-pam-ldapd: . common nslcd

["Commits of the nss-pam-ldapd project." <nss-pam-ldapd-commits [at] lists.arthurdejong.org>]

Author: arthur
Date: Sat Jun 12 13:34:56 2010
New Revision: 1138
URL: http://arthurdejong.org/viewvc/nss-pam-ldapd?view=rev&revision=1138

Log:
remove commented out memberOf and ipNetmaskNumber attributes and small cleanups

Modified:
   nss-pam-ldapd/README
   nss-pam-ldapd/common/tio.c
   nss-pam-ldapd/nslcd/attmap.c
   nss-pam-ldapd/nslcd/attmap.h
   nss-pam-ldapd/nslcd/group.c
   nss-pam-ldapd/nslcd/network.c

Modified: nss-pam-ldapd/README
==============================================================================
--- nss-pam-ldapd/README        Sat Jun 12 11:03:35 2010        (r1137)
+++ nss-pam-ldapd/README        Sat Jun 12 13:34:56 2010        (r1138)
@@ -308,7 +308,6 @@
 networks (objectClass=ipNetwork)
   cn                - network name
   ipNetworkNumber   - network address
-  ipNetmaskNumber   - network netmask
 passwd (objectClass=posixAccount)
   uid               - account name
   userPassword      - password

Modified: nss-pam-ldapd/common/tio.c
==============================================================================
--- nss-pam-ldapd/common/tio.c  Sat Jun 12 11:03:35 2010        (r1137)
+++ nss-pam-ldapd/common/tio.c  Sat Jun 12 13:34:56 2010        (r1138)
@@ -232,7 +232,6 @@
   /* have a more convenient storage type for the buffer */
   uint8_t *ptr=(uint8_t *)buf;
   /* build a time by which we should be finished */
-  /* TODO: probably only set up deadline if we have to do select() */
   tio_tv_prepare(&deadline,&(fp->readtimeout));
   /* loop until we have returned all the needed data */
   while (1)

Modified: nss-pam-ldapd/nslcd/attmap.c
==============================================================================
--- nss-pam-ldapd/nslcd/attmap.c        Sat Jun 12 11:03:35 2010        (r1137)
+++ nss-pam-ldapd/nslcd/attmap.c        Sat Jun 12 13:34:56 2010        (r1138)
@@ -147,7 +147,6 @@
     if (strcasecmp(name,"gidNumber")==0)         return 
&attmap_group_gidNumber;
     if (strcasecmp(name,"memberUid")==0)         return 
&attmap_group_memberUid;
     if (strcasecmp(name,"uniqueMember")==0)      return 
&attmap_group_uniqueMember;
-/*    if (strcasecmp(name,"memberOf")==0)          return 
&attmap_group_memberOf; */
   }
   else if (map==LM_HOSTS)
   {

Modified: nss-pam-ldapd/nslcd/attmap.h
==============================================================================
--- nss-pam-ldapd/nslcd/attmap.h        Sat Jun 12 11:03:35 2010        (r1137)
+++ nss-pam-ldapd/nslcd/attmap.h        Sat Jun 12 13:34:56 2010        (r1138)
@@ -37,7 +37,6 @@
 extern const char *attmap_group_gidNumber;
 extern const char *attmap_group_memberUid;
 extern const char *attmap_group_uniqueMember;
-/*extern const char *attmap_group_memberOf;*/
 extern const char *attmap_host_cn;
 extern const char *attmap_host_ipHostNumber;
 extern const char *attmap_netgroup_cn;
@@ -45,7 +44,6 @@
 extern const char *attmap_netgroup_memberNisNetgroup;
 extern const char *attmap_network_cn;
 extern const char *attmap_network_ipNetworkNumber;
-/*extern const char *attmap_network_ipNetmaskNumber; */
 extern const char *attmap_passwd_uid;
 extern const char *attmap_passwd_userPassword;
 extern const char *attmap_passwd_uidNumber;

Modified: nss-pam-ldapd/nslcd/group.c
==============================================================================
--- nss-pam-ldapd/nslcd/group.c Sat Jun 12 11:03:35 2010        (r1137)
+++ nss-pam-ldapd/nslcd/group.c Sat Jun 12 13:34:56 2010        (r1138)
@@ -66,7 +66,6 @@
 const char *attmap_group_gidNumber     = "gidNumber";
 const char *attmap_group_memberUid     = "memberUid";
 const char *attmap_group_uniqueMember  = "uniqueMember";
-/*const char *attmap_group_memberOf      = "memberOf";*/
 
 /* default values for attributes */
 static const char *default_group_userPassword     = "*"; /* unmatchable */

Modified: nss-pam-ldapd/nslcd/network.c
==============================================================================
--- nss-pam-ldapd/nslcd/network.c       Sat Jun 12 11:03:35 2010        (r1137)
+++ nss-pam-ldapd/nslcd/network.c       Sat Jun 12 13:34:56 2010        (r1138)
@@ -56,7 +56,6 @@
 /* the attributes used in searches */
 const char *attmap_network_cn              = "cn";
 const char *attmap_network_ipNetworkNumber = "ipNetworkNumber";
-/*const char *attmap_network_ipNetmaskNumber = "ipNetmaskNumber"; */
 
 /* the attribute list to request with searches */
 static const char *network_attrs[3];
--
To unsubscribe send an email to
nss-pam-ldapd-commits-unsubscribe@lists.arthurdejong.org or see
http://lists.arthurdejong.org/nss-pam-ldapd-commits