Skip to contentSkip to conversation

nfsidmap: Don't check ENABLE_LDAP twice

PATCH In review Aníbal Monsalve Salazar 2 participants 2 messages May 25, 2013 – May 28, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nfsidmap: Don't check ENABLE_LDAP twice

To build the Debian libnfsidmap package, I've used the patch in this mail for more than a year.

Debian-BTS: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=661215
Author: Steve Langasek <[email protected]>
Description: Don't check ENABLE_LDAP twice
This source is already being conditionally compiled based on ENABLE_LDAP being set in the Makefile. All this extra check does is cause umich_ldap.so to always be compiled as an *EMPTY* object because nothing sets ENABLE_LDAP before the #ifdef!
Bug-Ubuntu: https://bugs.launchpad.net/bugs/939232

umich_ldap.c +0 -3
diff -up a/umich_ldap.c b/umich_ldap.c
@@ -32,8 +32,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef ENABLE_LDAP
-
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
@@ -1302,4 +1300,3 @@ struct trans_func *libnfsidmap_plugin_in
 {
 	return (&umichldap_trans);
 }
-#endif
#1 lore raw
Quoted 11 lines · Aníbal Monsalve Salazar

To build the Debian libnfsidmap package, I've used the patch in this mail for more than a year.

Debian-BTS: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=661215
Author: Steve Langasek <[email protected]>
Description: Don't check ENABLE_LDAP twice
This source is already being conditionally compiled based on ENABLE_LDAP being set in the Makefile. All this extra check does is cause umich_ldap.so to always be compiled as an *EMPTY* object because nothing sets ENABLE_LDAP before the #ifdef!
Bug-Ubuntu: https://bugs.launchpad.net/bugs/939232

Committed...

steved.

Quoted 23 lines

diff -up a/umich_ldap.c b/umich_ldap.c

umich_ldap.c +0 -4
@@ -32,8 +32,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef ENABLE_LDAP
-
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
@@ -1302,4 +1300,3 @@ struct trans_func *libnfsidmap_plugin_in
 {
 	return (&umichldap_trans);
 }
-#endif
--

To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html