|
 |
7c7f29 |
From bd07b274a2bdbb1accf0d808c1c6a774c95d10db Mon Sep 17 00:00:00 2001
|
|
|
7c7f29 |
From: Noriko Hosoi <nhosoi@redhat.com>
|
|
|
7c7f29 |
Date: Thu, 14 Jul 2016 16:35:38 -0700
|
|
|
7c7f29 |
Subject: [PATCH 15/15] Ticket #48919 - Compiler warnings while building
|
|
|
7c7f29 |
389-ds-base on RHEL7
|
|
|
7c7f29 |
|
|
|
7c7f29 |
Description: Fixing additional complier warnings.
|
|
|
7c7f29 |
1. ldap/servers/slapd/attrsyntax.c
|
|
|
7c7f29 |
attr_syntax_force_to_delete(struct asyntaxinfo *asip, void *arg)
|
|
|
7c7f29 |
This function does not care the attr_syntax_enum_flaginfo.
|
|
|
7c7f29 |
2. ldap/servers/slapd/detach.c
|
|
|
7c7f29 |
Let detach use the rc which must be 0 (success).
|
|
|
7c7f29 |
3. ldap/systools/idsktune.c
|
|
|
7c7f29 |
Removing #define _GNU_SOURCE from idsktune.c.
|
|
|
7c7f29 |
The macro is defined in config.h generated by configure.
|
|
|
7c7f29 |
$ egrep _GNU_SOURCE config.h
|
|
|
7c7f29 |
#define _GNU_SOURCE 1
|
|
|
7c7f29 |
|
|
|
7c7f29 |
https://fedorahosted.org/389/ticket/48919
|
|
|
7c7f29 |
|
|
|
7c7f29 |
Reviewed by wibrown@redhat.com (Thanks, William!)
|
|
|
7c7f29 |
|
|
|
7c7f29 |
(cherry picked from commit 7c9853e07a85db3b46cd1eb6eacdacf3f17c39a0)
|
|
|
7c7f29 |
---
|
|
|
7c7f29 |
ldap/servers/slapd/attrsyntax.c | 4 ----
|
|
|
7c7f29 |
ldap/servers/slapd/detach.c | 2 +-
|
|
|
7c7f29 |
ldap/systools/idsktune.c | 2 --
|
|
|
7c7f29 |
3 files changed, 1 insertion(+), 7 deletions(-)
|
|
|
7c7f29 |
|
|
|
7c7f29 |
diff --git a/ldap/servers/slapd/attrsyntax.c b/ldap/servers/slapd/attrsyntax.c
|
|
|
7c7f29 |
index 8b2a77a..aec6d21 100644
|
|
|
7c7f29 |
--- a/ldap/servers/slapd/attrsyntax.c
|
|
|
7c7f29 |
+++ b/ldap/servers/slapd/attrsyntax.c
|
|
|
7c7f29 |
@@ -1390,11 +1390,7 @@ attr_syntax_delete_if_not_flagged(struct asyntaxinfo *asip, void *arg)
|
|
|
7c7f29 |
static int
|
|
|
7c7f29 |
attr_syntax_force_to_delete(struct asyntaxinfo *asip, void *arg)
|
|
|
7c7f29 |
{
|
|
|
7c7f29 |
- struct attr_syntax_enum_flaginfo *fi;
|
|
|
7c7f29 |
-
|
|
|
7c7f29 |
PR_ASSERT( asip != NULL );
|
|
|
7c7f29 |
- fi = (struct attr_syntax_enum_flaginfo *)arg;
|
|
|
7c7f29 |
- PR_ASSERT( fi != NULL );
|
|
|
7c7f29 |
|
|
|
7c7f29 |
attr_syntax_delete_no_lock( asip, PR_FALSE, 0 );
|
|
|
7c7f29 |
return ATTR_SYNTAX_ENUM_REMOVE;
|
|
|
7c7f29 |
diff --git a/ldap/servers/slapd/detach.c b/ldap/servers/slapd/detach.c
|
|
|
7c7f29 |
index b055a5c..54c6028 100644
|
|
|
7c7f29 |
--- a/ldap/servers/slapd/detach.c
|
|
|
7c7f29 |
+++ b/ldap/servers/slapd/detach.c
|
|
|
7c7f29 |
@@ -133,7 +133,7 @@ detach( int slapd_exemode, int importexport_encrypt,
|
|
|
7c7f29 |
}
|
|
|
7c7f29 |
|
|
|
7c7f29 |
(void) SIGNAL( SIGPIPE, SIG_IGN );
|
|
|
7c7f29 |
- return 0;
|
|
|
7c7f29 |
+ return rc;
|
|
|
7c7f29 |
}
|
|
|
7c7f29 |
|
|
|
7c7f29 |
/*
|
|
|
7c7f29 |
diff --git a/ldap/systools/idsktune.c b/ldap/systools/idsktune.c
|
|
|
7c7f29 |
index ad6a39e..4c96529 100644
|
|
|
7c7f29 |
--- a/ldap/systools/idsktune.c
|
|
|
7c7f29 |
+++ b/ldap/systools/idsktune.c
|
|
|
7c7f29 |
@@ -11,8 +11,6 @@
|
|
|
7c7f29 |
# include <config.h>
|
|
|
7c7f29 |
#endif
|
|
|
7c7f29 |
|
|
|
7c7f29 |
-#define _GNU_SOURCE
|
|
|
7c7f29 |
-
|
|
|
7c7f29 |
/* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
|
|
|
7c7f29 |
* Don't forget to update build_date when the patch sets are updated.
|
|
|
7c7f29 |
* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! */
|
|
|
7c7f29 |
--
|
|
|
7c7f29 |
2.4.11
|
|
|
7c7f29 |
|