From c96f8f168e7949038b628d23937739bad6f69549 Mon Sep 17 00:00:00 2001
From: Howard Chu <hyc@openldap.org>
Date: Fri, 7 Dec 2001 03:19:29 +0000
Subject: [PATCH] Minor fixes from jon@symas.com

---
 libraries/liblutil/uuid.c  | 2 +-
 libraries/librewrite/map.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/libraries/liblutil/uuid.c b/libraries/liblutil/uuid.c
index 0775edf00a..7497c96888 100644
--- a/libraries/liblutil/uuid.c
+++ b/libraries/liblutil/uuid.c
@@ -27,8 +27,8 @@
 #else
 #  include <ac/socket.h>
 #  include <ac/time.h>
-#  include <net/if.h>
 #  ifdef HAVE_SYS_SYSCTL_H
+#    include <net/if.h>
 #    include <sys/sysctl.h>
 #    include <net/route.h>
 #  endif
diff --git a/libraries/librewrite/map.c b/libraries/librewrite/map.c
index c1fc47d3a8..9fbf330c3c 100644
--- a/libraries/librewrite/map.c
+++ b/libraries/librewrite/map.c
@@ -24,7 +24,9 @@
 
 #include <portable.h>
 
+#ifdef HAVE_PWD_H
 #include <pwd.h>
+#endif
 
 #include "rewrite-int.h"
 #include "rewrite-map.h"
@@ -519,6 +521,7 @@ rewrite_xmap_apply(
 	val->bv_len = 0;
 	
 	switch ( map->lm_type ) {
+#ifdef HAVE_GETPWNAM
 	case REWRITE_MAP_XPWDMAP: {
 		struct passwd *pwd;
 
@@ -562,6 +565,7 @@ rewrite_xmap_apply(
 			
 		break;
 	}
+#endif /* HAVE_GETPWNAM*/
 	
 	case REWRITE_MAP_XFILEMAP: {
 		char buf[1024];
-- 
2.39.5