File pending-upstream.patch of Package sblim-sfcb

Overview Repositories Revisions Requests Users Attributes Meta

File pending-upstream.patch of Package sblim-sfcb

diff -wruN -x '*~' ../orig-sblim-sfcb-1.3.13/cimcClientSfcbLocal.c ./cimcClientSfcbLocal.c
--- ../orig-sblim-sfcb-1.3.13/cimcClientSfcbLocal.c	2011-09-27 17:31:48.000000000 +0200
+++ ./cimcClientSfcbLocal.c	2011-09-30 09:00:18.000000000 +0200
@@ -214,7 +214,6 @@
   if (cl->connection) CMRelease(cl->connection);
 
   free(cl);
-  closeLogging();
   return rc;
 }
 
@@ -1907,6 +1906,7 @@
 static void* release(ClientEnv* ce)
 {
    void *lib=ce->hdl;
+   closeLogging();
    CONNECT_LOCK();
    if (localConnectCount > 0) localConnectCount -= 1;
    if (localConnectCount == 0) {
diff -wruN -x '*~' ../orig-sblim-sfcb-1.3.13/configure.ac ./configure.ac
--- ../orig-sblim-sfcb-1.3.13/configure.ac	2011-09-29 18:04:10.000000000 +0200
+++ ./configure.ac	2011-09-30 09:00:18.000000000 +0200
@@ -24,12 +24,14 @@
 
 AC_INIT(Small Footprint CIM Broker, 1.3.13, sblim-devel@lists.sourceforge.net, sblim-sfcb)
 AC_CONFIG_SRCDIR([providerDrv.c])
+AC_CONFIG_MACRO_DIR([m4])
 
 #disable "seems to ignore the --datarootdir setting" warnings
 #AC_DEFUN([AC_DATAROOTDIR_CHECKED])
 
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER([config.h])
+ACLOCAL_AMFLAGS=-I m4
 
 AC_ARG_ENABLE(debug,
 	[AC_HELP_STRING([--disable-debug],
diff -wruN -x '*~' ../orig-sblim-sfcb-1.3.13/fileRepository.c ./fileRepository.c
--- ../orig-sblim-sfcb-1.3.13/fileRepository.c	2009-11-09 22:03:30.000000000 +0100
+++ ./fileRepository.c	2011-09-30 09:00:18.000000000 +0200
@@ -573,7 +573,7 @@
 #endif
     
    if ((d=opendir(fn))==NULL) {
-      perror("opendir");
+      fprintf(stderr, "opendir: %s: %s\n", fn, strerror(errno));   
       return 0;
    }   
    closedir(d);
diff -wruN -x '*~' ../orig-sblim-sfcb-1.3.13/Makefile.am ./Makefile.am
--- ../orig-sblim-sfcb-1.3.13/Makefile.am	2011-09-21 16:50:20.000000000 +0200
+++ ./Makefile.am	2011-09-30 09:00:18.000000000 +0200
@@ -623,7 +623,7 @@
 test: testprep check testreport
 endif
 
-postinstall: install-cimschema create-sslkeys
+postinstall: #install-cimschema create-sslkeys
 	test -f $(DESTDIR)$(sfcbstatedir)/registration/providerRegister || $(INSTALL_DATA) $(DESTDIR)$(sfcbstatedir)/stage/default.reg $(DESTDIR)$(sfcbstatedir)/registration/providerRegister 
 if TEST_ENABLED
 	./test/stageschema.sh -d test/schema -p $(prefix)
diff -wruN -x '*~' ../orig-sblim-sfcb-1.3.13/providerRegister.c ./providerRegister.c
--- ../orig-sblim-sfcb-1.3.13/providerRegister.c	2010-05-01 00:25:38.000000000 +0200
+++ ./providerRegister.c	2011-09-30 09:00:18.000000000 +0200
@@ -178,7 +178,7 @@
      dir = "/var/lib/sfcb/registration";
    }
 
-   strcpy(fin, dir);
+   strncpy(fin, dir, sizeof(fin)-18); /* 18 = strlen("/providerRegister")+1 */
    strcat(fin, "/providerRegister");
    in = fopen(fin, "r");
    if (in == NULL) 
@@ -192,7 +192,7 @@
       bb->ht = UtilFactory->newHashTable(61,
                   UtilHashTable_charKey | UtilHashTable_ignoreKeyCase);
 
-      while (fgets(fin, 1024, in)) {
+      while (fgets(fin, sizeof(fin), in)) {
          n++;
          if (stmt) free(stmt);
          stmt = strdup(fin);
diff -wruN -x '*~' ../orig-sblim-sfcb-1.3.13/sfcBroker.c ./sfcBroker.c
--- ../orig-sblim-sfcb-1.3.13/sfcBroker.c	2011-06-24 22:13:20.000000000 +0200
+++ ./sfcBroker.c	2011-09-30 09:00:18.000000000 +0200
@@ -559,7 +559,7 @@
 	       if (*optarg == '?') {
 		   fprintf(stdout, "---   Traceable Components:     Int       Hex\n");
 		   for (i = 0; traceIds[i].id; i++)
-		       fprintf(stdout, "--- \t%18s:    %d\t0x%05X\n", traceIds[i].id, traceIds[i].code, traceIds[i].code);
+		       fprintf(stdout, "--- \t%18s:    %d\t0x%07X\n", traceIds[i].id, traceIds[i].code, traceIds[i].code);
 		   exit(0);
 	       } else if (isdigit(*optarg)) {
 		   char *ep;

Places

File pending-upstream.patch of Package sblim-sfcb

Places