File sblim-cmpi-dns-1.0.dif of Package sblim-cmpi-dns
diff -wruN ../orig-sblim-cmpi-dns-0.5.6/configure.ac ./configure.ac
--- ../orig-sblim-cmpi-dns-0.5.6/configure.ac 2009-06-17 16:05:33.000000000 +0200
+++ ./configure.ac 2009-08-25 12:07:43.000000000 +0200
@@ -6,6 +6,7 @@
AC_CONFIG_SRCDIR([.])
AC_CONFIG_HEADER([config.h])
AM_INIT_AUTOMAKE([tar-ustar])
+AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_HOST
case $host_cpu in
@@ -24,6 +25,7 @@
# Checks for programs.
AC_PROG_AWK
AC_PROG_CC
+AM_PROG_CC_C_O
AC_PROG_CXX
AC_PROG_INSTALL
AC_PROG_LIBTOOL
diff -wruN ../orig-sblim-cmpi-dns-0.5.6/Makefile.am ./Makefile.am
--- ../orig-sblim-cmpi-dns-0.5.6/Makefile.am 2008-04-30 01:41:37.000000000 +0200
+++ ./Makefile.am 2009-08-25 15:22:15.000000000 +0200
@@ -24,7 +24,7 @@
# docdir defines where the documentation goes
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
+docdir = $(datadir)/doc/packages/$(PACKAGE)
# Non-Installable Header Files
noinst_HEADERS =
@@ -64,8 +64,7 @@
######################################################################################
# Automake instructions for ./model subdir
-SCHEMAS = $(srcdir)/model/Linux_Dns_Profile.mof \
- $(srcdir)/model/Linux_Dns.mof
+SCHEMAS = $(srcdir)/model/Linux_Dns.mof
REGISTRATIONS = $(srcdir)/model/Linux_Dns.registration
diff -wruN ../orig-sblim-cmpi-dns-0.5.6/man/Makefile.am ./man/Makefile.am
--- ../orig-sblim-cmpi-dns-0.5.6/man/Makefile.am 2007-10-17 21:52:11.000000000 +0200
+++ ./man/Makefile.am 2009-08-25 15:15:16.000000000 +0200
@@ -20,5 +20,5 @@
man5_MANS = \
smt_dns_ra_support.conf.5
-dist_man_MANS = \
- smt_dns_ra_support.conf.5
+EXTRA_DIST = \
+ smt_dns_ra_support.conf.5.pre
diff -wruN ../orig-sblim-cmpi-dns-0.5.6/provider/include/smt_dns_array.h ./provider/include/smt_dns_array.h
--- ../orig-sblim-cmpi-dns-0.5.6/provider/include/smt_dns_array.h 2006-01-16 19:13:22.000000000 +0100
+++ ./provider/include/smt_dns_array.h 2009-08-25 12:21:43.000000000 +0200
@@ -19,7 +19,7 @@
#define _SMT_DNS_ARRAY_H
#include <string>
-#include <vector>
+#include <list>
#include <iterator>
using namespace std;
diff -wruN ../orig-sblim-cmpi-dns-0.5.6/provider/Linux_DnsForwardZone/Linux_DnsForwardZoneResourceAccess.cpp ./provider/Linux_DnsForwardZone/Linux_DnsForwardZoneResourceAccess.cpp
--- ../orig-sblim-cmpi-dns-0.5.6/provider/Linux_DnsForwardZone/Linux_DnsForwardZoneResourceAccess.cpp 2007-11-19 22:49:47.000000000 +0100
+++ ./provider/Linux_DnsForwardZone/Linux_DnsForwardZoneResourceAccess.cpp 2009-08-25 15:46:16.000000000 +0200
@@ -355,7 +355,7 @@
DNSZONE * newZone = NULL;
Linux_DnsForwardZoneInstanceName anInstanceName = aManualInstance.getInstanceName();
- if (((anInstanceName.getName()) == NULL) || ((anInstanceName.getName()) == "" ) || ((anInstanceName.getName()) == " " ) ) {
+ if (((anInstanceName.getName()) == NULL) || (anInstanceName.getName()[0] == 0 ) || (anInstanceName.getName() == string(" ") ) ) {
throw CmpiStatus(CMPI_RC_ERR_INVALID_PARAMETER,"Zonename is invalid");
}
diff -wruN ../orig-sblim-cmpi-dns-0.5.6/provider/Linux_DnsHintZone/Linux_DnsHintZoneResourceAccess.cpp ./provider/Linux_DnsHintZone/Linux_DnsHintZoneResourceAccess.cpp
--- ../orig-sblim-cmpi-dns-0.5.6/provider/Linux_DnsHintZone/Linux_DnsHintZoneResourceAccess.cpp 2007-11-19 22:49:49.000000000 +0100
+++ ./provider/Linux_DnsHintZone/Linux_DnsHintZoneResourceAccess.cpp 2009-08-25 15:46:52.000000000 +0200
@@ -361,7 +361,7 @@
DNSZONE * newZone = NULL;
Linux_DnsHintZoneInstanceName anInstanceName = aManualInstance.getInstanceName();
- if (((anInstanceName.getName()) == NULL) || ((anInstanceName.getName()) == "" ) || ((anInstanceName.getName()) == " " ) ) {
+ if (((anInstanceName.getName()) == NULL) || (anInstanceName.getName()[0] == 0 ) || (anInstanceName.getName() == string(" ") ) ) {
throw CmpiStatus(CMPI_RC_ERR_INVALID_PARAMETER,"Zonename is invalid");
}
diff -wruN ../orig-sblim-cmpi-dns-0.5.6/provider/Linux_DnsMasterZone/Linux_DnsMasterZoneResourceAccess.cpp ./provider/Linux_DnsMasterZone/Linux_DnsMasterZoneResourceAccess.cpp
--- ../orig-sblim-cmpi-dns-0.5.6/provider/Linux_DnsMasterZone/Linux_DnsMasterZoneResourceAccess.cpp 2007-11-19 22:49:50.000000000 +0100
+++ ./provider/Linux_DnsMasterZone/Linux_DnsMasterZoneResourceAccess.cpp 2009-08-25 12:38:38.000000000 +0200
@@ -25,6 +25,7 @@
#include "Linux_DnsMasterZoneResourceAccess.h"
#include <iostream>
+#include <stdio.h> // for sprintf
using namespace std;
@@ -365,7 +366,7 @@
DNSZONE * newZone = NULL;
Linux_DnsMasterZoneInstanceName anInstanceName = aManualInstance.getInstanceName();
- if (((anInstanceName.getName()) == NULL) || ((anInstanceName.getName()) == "" ) || ((anInstanceName.getName()) == " " ) ) {
+ if (((anInstanceName.getName()) == NULL) || (anInstanceName.getName()[0] == 0) || (anInstanceName.getName() == string(" ") ) ) {
throw CmpiStatus(CMPI_RC_ERR_INVALID_PARAMETER,"Zonename is invalid");
}
diff -wruN ../orig-sblim-cmpi-dns-0.5.6/provider/Linux_DnsSlaveZone/Linux_DnsSlaveZoneResourceAccess.cpp ./provider/Linux_DnsSlaveZone/Linux_DnsSlaveZoneResourceAccess.cpp
--- ../orig-sblim-cmpi-dns-0.5.6/provider/Linux_DnsSlaveZone/Linux_DnsSlaveZoneResourceAccess.cpp 2007-11-19 22:49:58.000000000 +0100
+++ ./provider/Linux_DnsSlaveZone/Linux_DnsSlaveZoneResourceAccess.cpp 2009-08-25 15:47:25.000000000 +0200
@@ -362,7 +362,7 @@
DNSZONE * newZone = NULL;
Linux_DnsSlaveZoneInstanceName anInstanceName = aManualInstance.getInstanceName();
- if (((anInstanceName.getName()) == NULL) || ((anInstanceName.getName()) == "" ) || ((anInstanceName.getName()) == " " ) ) {
+ if (((anInstanceName.getName()) == NULL) || (anInstanceName.getName()[0] == 0 ) || (anInstanceName.getName() == string(" ") ) ) {
throw CmpiStatus(CMPI_RC_ERR_INVALID_PARAMETER,"Zonename is invalid");
}
diff -wruN ../orig-sblim-cmpi-dns-0.5.6/provider/Linux_DnsStubZone/Linux_DnsStubZoneResourceAccess.cpp ./provider/Linux_DnsStubZone/Linux_DnsStubZoneResourceAccess.cpp
--- ../orig-sblim-cmpi-dns-0.5.6/provider/Linux_DnsStubZone/Linux_DnsStubZoneResourceAccess.cpp 2007-11-19 22:50:00.000000000 +0100
+++ ./provider/Linux_DnsStubZone/Linux_DnsStubZoneResourceAccess.cpp 2009-08-25 15:47:54.000000000 +0200
@@ -363,7 +363,7 @@
DNSZONE * newZone = NULL;
Linux_DnsStubZoneInstanceName anInstanceName = aManualInstance.getInstanceName();
- if (((anInstanceName.getName()) == NULL) || ((anInstanceName.getName()) == "" ) || ((anInstanceName.getName()) == " " ) ) {
+ if (((anInstanceName.getName()) == NULL) || (anInstanceName.getName()[0] == 0 ) || (anInstanceName.getName() == string(" ") ) ) {
throw CmpiStatus(CMPI_RC_ERR_INVALID_PARAMETER,"Zonename is invalid");
}
diff -wruN ../orig-sblim-cmpi-dns-0.5.6/provider/support/smt_dns_array.cpp ./provider/support/smt_dns_array.cpp
--- ../orig-sblim-cmpi-dns-0.5.6/provider/support/smt_dns_array.cpp 2005-10-18 14:13:45.000000000 +0200
+++ ./provider/support/smt_dns_array.cpp 2009-08-25 12:30:04.000000000 +0200
@@ -18,6 +18,9 @@
#include <string>
#include <list>
#include <iostream>
+#include <algorithm> // find
+#include <stdlib.h> // malloc
+#include <string.h> // strdup
using namespace std;
diff -wruN ../orig-sblim-cmpi-dns-0.5.6/test/Makefile.am ./test/Makefile.am
--- ../orig-sblim-cmpi-dns-0.5.6/test/Makefile.am 2008-05-13 04:16:00.000000000 +0200
+++ ./test/Makefile.am 2009-08-25 15:21:57.000000000 +0200
@@ -14,7 +14,7 @@
# docdir defines where the documentation goes
-docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
+docdir = $(datadir)/doc/packages/$(PACKAGE)
######################################################################################
