|
 |
be9751 |
From 22fb8b2690a5fa364d252846f06b77b5fec8c602 Mon Sep 17 00:00:00 2001
|
|
|
be9751 |
From: Mark Reynolds <mreynolds@redhat.com>
|
|
|
be9751 |
Date: Thu, 7 Jan 2021 10:27:43 -0500
|
|
|
be9751 |
Subject: [PATCH 3/6] Fix cherry-pick erorr
|
|
|
be9751 |
|
|
|
be9751 |
---
|
|
|
be9751 |
ldap/servers/slapd/slapi-private.h | 11 -----------
|
|
|
be9751 |
1 file changed, 11 deletions(-)
|
|
|
be9751 |
|
|
|
be9751 |
diff --git a/ldap/servers/slapd/slapi-private.h b/ldap/servers/slapd/slapi-private.h
|
|
|
be9751 |
index e0092d571..d5abe8ac1 100644
|
|
|
be9751 |
--- a/ldap/servers/slapd/slapi-private.h
|
|
|
be9751 |
+++ b/ldap/servers/slapd/slapi-private.h
|
|
|
be9751 |
@@ -1476,17 +1476,6 @@ typedef enum task_warning_t{
|
|
|
be9751 |
int32_t slapi_pblock_get_task_warning(Slapi_PBlock *pb);
|
|
|
be9751 |
void slapi_pblock_set_task_warning(Slapi_PBlock *pb, task_warning warn);
|
|
|
be9751 |
|
|
|
be9751 |
-/* task warnings */
|
|
|
be9751 |
-typedef enum task_warning_t{
|
|
|
be9751 |
- WARN_UPGARDE_DN_FORMAT_ALL = (1 << 0),
|
|
|
be9751 |
- WARN_UPGRADE_DN_FORMAT = (1 << 1),
|
|
|
be9751 |
- WARN_UPGRADE_DN_FORMAT_SPACE = (1 << 2),
|
|
|
be9751 |
- WARN_SKIPPED_IMPORT_ENTRY = (1 << 3)
|
|
|
be9751 |
-} task_warning;
|
|
|
be9751 |
-
|
|
|
be9751 |
-int32_t slapi_pblock_get_task_warning(Slapi_PBlock *pb);
|
|
|
be9751 |
-void slapi_pblock_set_task_warning(Slapi_PBlock *pb, task_warning warn);
|
|
|
be9751 |
-
|
|
|
be9751 |
int slapi_exists_or_add_internal(Slapi_DN *dn, const char *filter, const char *entry, const char *modifier_name);
|
|
|
be9751 |
|
|
|
be9751 |
#ifdef __cplusplus
|
|
|
be9751 |
--
|
|
|
be9751 |
2.26.2
|
|
|
be9751 |
|