[devel] [PATCH 1 of 1] immtools: support long DN in imm tools [#1038]

[Zoran Milinkovic]

 osaf/tools/safimm/immadm/imm_admin.c    |  7 +++++++
 osaf/tools/safimm/immcfg/imm_cfg.c      |  6 ++++++
 osaf/tools/safimm/immdump/imm_dumper.cc |  8 ++++++++
 osaf/tools/safimm/immfind/imm_find.c    |  6 ++++++
 osaf/tools/safimm/immlist/imm_list.c    |  7 +++++++
 5 files changed, 34 insertions(+), 0 deletions(-)


Add support for long DN in imm tools. Disabling long DN support will not be 
possible.

diff --git a/osaf/tools/safimm/immadm/imm_admin.c 
b/osaf/tools/safimm/immadm/imm_admin.c
--- a/osaf/tools/safimm/immadm/imm_admin.c
+++ b/osaf/tools/safimm/immadm/imm_admin.c
@@ -41,6 +41,7 @@
 
 #include <immutil.h>
 #include <saf_error.h>
+#include "osaf_extended_name.h"
 
 #define PARAMDELIM ":"
 
@@ -267,6 +268,12 @@ int main(int argc, char *argv[])
 
        int params_len = 0;
 
+       /* Support for long DN */
+       setenv("SA_ENABLE_EXTENDED_NAMES", "1", 1);
+       /* osaf_extended_name_init() is added to prevent future safe use of
+        * osaf_extended_name_* before saImmOmInitialize and saImmOiInitialize 
*/
+       osaf_extended_name_init();
+
        params = realloc(NULL, sizeof(SaImmAdminOperationParamsT_2 *));
        params[0] = NULL;
        SaStringT opName = NULL;
diff --git a/osaf/tools/safimm/immcfg/imm_cfg.c 
b/osaf/tools/safimm/immcfg/imm_cfg.c
--- a/osaf/tools/safimm/immcfg/imm_cfg.c
+++ b/osaf/tools/safimm/immcfg/imm_cfg.c
@@ -1539,5 +1539,11 @@ static int imm_operation(int argc, char 
 }
 
 int main(int argc, char *argv[]) {
+       /* Support for long DN */
+       setenv("SA_ENABLE_EXTENDED_NAMES", "1", 1);
+       /* osaf_extended_name_init() is added to prevent future safe use of
+        * osaf_extended_name_* before saImmOmInitialize and saImmOiInitialize 
*/
+       osaf_extended_name_init();
+
        return imm_operation(argc, argv);
 }
diff --git a/osaf/tools/safimm/immdump/imm_dumper.cc 
b/osaf/tools/safimm/immdump/imm_dumper.cc
--- a/osaf/tools/safimm/immdump/imm_dumper.cc
+++ b/osaf/tools/safimm/immdump/imm_dumper.cc
@@ -17,6 +17,7 @@
 
 
 #include "imm_dumper.hh"
+#include "osaf_extended_name.h"
 #include <iostream>
 #include <iomanip>
 #include <sstream>
@@ -28,6 +29,7 @@
 #include <assert.h>
 #include <libgen.h>
 #include <unistd.h>
+#include <stdlib.h>
 
 #define XML_VERSION "1.0"
 
@@ -111,6 +113,12 @@ int main(int argc, char* argv[])
     ClassMap classIdMap;
     int objCount=0;
 
+       /* Support for long DN */
+       setenv("SA_ENABLE_EXTENDED_NAMES", "1", 1);
+       /* osaf_extended_name_init() is added to prevent future safe use of
+        * osaf_extended_name_* before saImmOmInitialize and saImmOiInitialize 
*/
+       osaf_extended_name_init();
+
     if ((logPath = getenv("IMMSV_TRACE_PATHNAME")))
     {
         category_mask = 0xffffffff; /* TODO: set using -t flag ? */
diff --git a/osaf/tools/safimm/immfind/imm_find.c 
b/osaf/tools/safimm/immfind/imm_find.c
--- a/osaf/tools/safimm/immfind/imm_find.c
+++ b/osaf/tools/safimm/immfind/imm_find.c
@@ -109,6 +109,12 @@ int main(int argc, char *argv[])
        const char* className = "";
        unsigned long timeoutVal = 60;
 
+       /* Support for long DN */
+       setenv("SA_ENABLE_EXTENDED_NAMES", "1", 1);
+       /* osaf_extended_name_init() is added to prevent future safe use of
+        * osaf_extended_name_* before saImmOmInitialize and saImmOiInitialize 
*/
+       osaf_extended_name_init();
+
        while (1) {
                c = getopt_long(argc, argv, "c:s:t:h", long_options, NULL);
 
diff --git a/osaf/tools/safimm/immlist/imm_list.c 
b/osaf/tools/safimm/immlist/imm_list.c
--- a/osaf/tools/safimm/immlist/imm_list.c
+++ b/osaf/tools/safimm/immlist/imm_list.c
@@ -40,6 +40,7 @@
 #include <saImmOm.h>
 #include <immutil.h>
 #include <saf_error.h>
+#include "osaf_extended_name.h"
 
 static SaVersionT immVersion = { 'A', 2, 11 };
 extern struct ImmutilWrapperProfile immutilWrapperProfile;
@@ -433,6 +434,12 @@ int main(int argc, char *argv[])
        int rc = EXIT_SUCCESS;
        unsigned long timeoutVal = 60;
 
+       /* Support for long DN */
+       setenv("SA_ENABLE_EXTENDED_NAMES", "1", 1);
+       /* osaf_extended_name_init() is added to prevent future safe use of
+        * osaf_extended_name_* before saImmOmInitialize and saImmOiInitialize 
*/
+       osaf_extended_name_init();
+
        while (1) {
                c = getopt_long(argc, argv, "a:p:t:ch", long_options, NULL);
 

------------------------------------------------------------------------------
Slashdot TV.  
Video for Nerds.  Stuff that matters.
http://tv.slashdot.org/
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel