From 08ee271b224ad551d0ab7d2d3d57ecd5b3a670d6 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Tue, 19 Feb 2019 16:26:20 +0000
Subject:  Adapt to new skalibs/posixishard.h header

---
 src/libnsss/nsss_switch_grp_read.c    | 4 ++--
 src/libnsss/nsss_switch_pwd_read.c    | 4 ++--
 src/libnsss/nsss_switch_shadow_read.c | 4 ++--
 src/nsssd/nsssd-nslcd.c               | 5 ++++-
 src/nsssd/nsssd_main.c                | 4 +++-
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/libnsss/nsss_switch_grp_read.c b/src/libnsss/nsss_switch_grp_read.c
index 74b981b..8e020e0 100644
--- a/src/libnsss/nsss_switch_grp_read.c
+++ b/src/libnsss/nsss_switch_grp_read.c
@@ -4,9 +4,9 @@
 #include <stdint.h>
 #include <string.h>
 #include <errno.h>
-#include <skalibs/posixplz.h>
+
+#include <skalibs/posixishard.h>
 #include <skalibs/uint32.h>
-#include <skalibs/error.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/genalloc.h>
 #include <skalibs/unix-timed.h>
diff --git a/src/libnsss/nsss_switch_pwd_read.c b/src/libnsss/nsss_switch_pwd_read.c
index 936b0f4..b26577a 100644
--- a/src/libnsss/nsss_switch_pwd_read.c
+++ b/src/libnsss/nsss_switch_pwd_read.c
@@ -3,9 +3,9 @@
 #include <stdint.h>
 #include <string.h>
 #include <errno.h>
-#include <skalibs/posixplz.h>
+
+#include <skalibs/posixishard.h>
 #include <skalibs/uint32.h>
-#include <skalibs/error.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/unix-timed.h>
 #include <nsss/pwd-def.h>
diff --git a/src/libnsss/nsss_switch_shadow_read.c b/src/libnsss/nsss_switch_shadow_read.c
index 1806c6d..034c7e0 100644
--- a/src/libnsss/nsss_switch_shadow_read.c
+++ b/src/libnsss/nsss_switch_shadow_read.c
@@ -3,10 +3,10 @@
 #include <stdint.h>
 #include <string.h>
 #include <errno.h>
-#include <skalibs/posixplz.h>
+
+#include <skalibs/posixishard.h>
 #include <skalibs/uint32.h>
 #include <skalibs/uint64.h>
-#include <skalibs/error.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/unix-timed.h>
 #include <nsss/shadow-def.h>
diff --git a/src/nsssd/nsssd-nslcd.c b/src/nsssd/nsssd-nslcd.c
index 17e646d..8f43ac9 100644
--- a/src/nsssd/nsssd-nslcd.c
+++ b/src/nsssd/nsssd-nslcd.c
@@ -1,12 +1,14 @@
 /* ISC license. */
 
 #include <skalibs/nonposix.h>
+
 #include <sys/socket.h>
 #include <sys/uio.h>
 #include <stdint.h>
 #include <errno.h>
+
+#include <skalibs/posixishard.h>
 #include <skalibs/posixplz.h>
-#include <skalibs/error.h>
 #include <skalibs/uint32.h>
 #include <skalibs/sgetopt.h>
 #include <skalibs/buffer.h>
@@ -15,6 +17,7 @@
 #include <skalibs/genalloc.h>
 #include <skalibs/webipc.h>
 #include <skalibs/unix-timed.h>
+
 #include <nsss/nsssd.h>
 #include "nsssd-nslcd.h"
 
diff --git a/src/nsssd/nsssd_main.c b/src/nsssd/nsssd_main.c
index 585b995..cc8a3f4 100644
--- a/src/nsssd/nsssd_main.c
+++ b/src/nsssd/nsssd_main.c
@@ -2,14 +2,16 @@
 
 #include <string.h>
 #include <errno.h>
+
+#include <skalibs/posixishard.h>
 #include <skalibs/uint32.h>
 #include <skalibs/uint64.h>
-#include <skalibs/error.h>
 #include <skalibs/buffer.h>
 #include <skalibs/strerr2.h>
 #include <skalibs/tai.h>
 #include <skalibs/djbunix.h>
 #include <skalibs/unix-timed.h>
+
 #include <nsss/pwd-def.h>
 #include <nsss/grp-def.h>
 #include <nsss/shadow-def.h>
-- 
cgit v1.3.1