summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Slebodnik <lslebodn@redhat.com>2017-08-03 14:29:52 +0200
committerJakub Hrozek <jhrozek@redhat.com>2017-08-03 18:19:22 +0200
commiteec0b39ed884814c124bfec2060b779023f8b200 (patch)
treeaab395a13e9f7cedd1540311a78eab5df06ec604
parentd84e841ede0a372a879531b2b7df6905e363b4ee (diff)
downloadsssd-eec0b39ed884814c124bfec2060b779023f8b200.tar.gz
sssd-eec0b39ed884814c124bfec2060b779023f8b200.tar.xz
sssd-eec0b39ed884814c124bfec2060b779023f8b200.zip
SHARED: Return warning back about minimal header files
The warning still make a sense and should be there. Patch also fixes header guards due t changed location. Related to: https://pagure.io/SSSD/sssd/issue/1898 Reviewed-by: Jakub Hrozek <jhrozek@redhat.com>
-rw-r--r--src/shared/io.h11
-rw-r--r--src/shared/murmurhash3.h11
-rw-r--r--src/shared/safealign.h11
3 files changed, 24 insertions, 9 deletions
diff --git a/src/shared/io.h b/src/shared/io.h
index 5a545b608..26caa5287 100644
--- a/src/shared/io.h
+++ b/src/shared/io.h
@@ -19,10 +19,15 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _UTIL_IO_H_
-#define _UTIL_IO_H_
+#ifndef _SHARED_IO_H_
+#define _SHARED_IO_H_
+
+/* CAUTION:
+ * This file is also used in sss_client (pam, nss). Therefore it have to be
+ * minimalist and cannot include DEBUG macros or header file util.h.
+ */
int sss_open_cloexec(const char *pathname, int flags, int *ret);
int sss_openat_cloexec(int dir_fd, const char *pathname, int flags, int *ret);
-#endif /* _UTIL_IO_H_ */
+#endif /* _SHARED_IO_H_ */
diff --git a/src/shared/murmurhash3.h b/src/shared/murmurhash3.h
index 3cea68ed3..27671831c 100644
--- a/src/shared/murmurhash3.h
+++ b/src/shared/murmurhash3.h
@@ -6,11 +6,16 @@
* clients can be both 64 or 32 bit at the same time.
*/
-#ifndef _UTIL_MURMURHASH3_H_
-#define _UTIL_MURMURHASH3_H_
+#ifndef _SHARED_MURMURHASH3_H_
+#define _SHARED_MURMURHASH3_H_
+
+/* CAUTION:
+ * This file is also used in sss_client (pam, nss). Therefore it have to be
+ * minimalist and cannot include DEBUG macros or header file util.h.
+ */
#include <stdint.h>
uint32_t murmurhash3(const char *key, int len, uint32_t seed);
-#endif /* _UTIL_MURMURHASH3_H_ */
+#endif /* _SHARED_MURMURHASH3_H_ */
diff --git a/src/shared/safealign.h b/src/shared/safealign.h
index cffc1c5d3..2316ed142 100644
--- a/src/shared/safealign.h
+++ b/src/shared/safealign.h
@@ -20,8 +20,13 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _SAFEALIGN_H
-#define _SAFEALIGN_H
+#ifndef _SHARED_SAFEALIGN_H
+#define _SHARED_SAFEALIGN_H
+
+/* CAUTION:
+ * This file is also used in sss_client (pam, nss). Therefore it have to be
+ * minimalist and cannot include DEBUG macros or header file util.h.
+ */
#include <string.h>
#include <stdint.h>
@@ -138,4 +143,4 @@ safealign_memcpy(void *dest, const void *src, size_t n, size_t *counter)
#define SAFEALIGN_SET_UINT16 SAFEALIGN_SETMEM_UINT16
#define SAFEALIGN_SET_STRING SAFEALIGN_SETMEM_STRING
-#endif /* _SAFEALIGN_H */
+#endif /* _SHARED_SAFEALIGN_H */