From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16641 invoked by alias); 10 Jul 2008 07:59:41 -0000 Received: (qmail 16605 invoked by uid 9452); 10 Jul 2008 07:59:39 -0000 Date: Thu, 10 Jul 2008 07:59:00 -0000 Message-ID: <20080710075939.16589.qmail@sourceware.org> From: ccaulfield@sourceware.org To: cluster-cvs@sources.redhat.com, cluster-devel@redhat.com Subject: Cluster Project branch, master, updated. cluster-2.99.05-60-gd049388 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: b67b729e452fa8f76fd13669c1879122cb59fdc6 X-Git-Newrev: d049388bf38cb58f7121fae8afab1be8277caad5 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2008-q3/txt/msg00034.txt.bz2 This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Cluster Project". http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=d049388bf38cb58f7121fae8afab1be8277caad5 The branch, master has been updated via d049388bf38cb58f7121fae8afab1be8277caad5 (commit) from b67b729e452fa8f76fd13669c1879122cb59fdc6 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit d049388bf38cb58f7121fae8afab1be8277caad5 Author: Christine Caulfield Date: Thu Jul 10 08:51:04 2008 +0100 [CONFIG] rename ldap config generator Rename loadldap to confdb2ldif. This more accurately expresses what the program does. I've also added a comment to the generated ldif file. Signed-off-by: Christine Caulfield ----------------------------------------------------------------------- Summary of changes: config/tools/ldap/Makefile | 5 ++--- config/tools/ldap/{loadldap.c => confdb2ldif.c} | 5 +++++ 2 files changed, 7 insertions(+), 3 deletions(-) rename config/tools/ldap/{loadldap.c => confdb2ldif.c} (96%) diff --git a/config/tools/ldap/Makefile b/config/tools/ldap/Makefile index dae9849..2eacf97 100644 --- a/config/tools/ldap/Makefile +++ b/config/tools/ldap/Makefile @@ -1,4 +1,4 @@ -TARGET= loadldap +TARGET= confdb2ldif SBINDIRT=$(TARGET) @@ -10,7 +10,7 @@ include $(OBJDIR)/make/clean.mk include $(OBJDIR)/make/install.mk include $(OBJDIR)/make/uninstall.mk -OBJS= loadldap.o +OBJS= confdb2ldif.o CFLAGS += -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE CFLAGS += -I${openaisincdir} @@ -23,7 +23,6 @@ ${TARGET}: ${OBJS} $(CC) -o $@ $^ $(LDFLAGS) depends: - $(MAKE) -C ../../libs all clean: generalclean diff --git a/config/tools/ldap/loadldap.c b/config/tools/ldap/confdb2ldif.c similarity index 96% rename from config/tools/ldap/loadldap.c rename to config/tools/ldap/confdb2ldif.c index c6c8f01..d173d00 100644 --- a/config/tools/ldap/loadldap.c +++ b/config/tools/ldap/confdb2ldif.c @@ -37,6 +37,7 @@ struct objectclasses { "device", "rhcsFenceagent" }, { "fencedevice", "rhcsFencedevice" }, { "method", "rhcsFencemethod" }, + { "logging", "rhcsLoggersubsys" }, }; /* TODO: Add more here as the schema gets filled in */ @@ -197,6 +198,10 @@ int main(int argc, char *argv[]) sprintf(basedn, "cn=%s,%s", clusterroot, argv[1]); + /* Print a header */ + printf("# This file was generated by confdb2ldif, from an existing cluster configuration\n"); + printf("#\n"); + /* Print the configuration */ print_config_tree(handle, cluster_handle, clusterroot, basedn); hooks/post-receive -- Cluster Project