From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 11575 invoked by alias); 9 Sep 2009 13:39:27 -0000 Received: (qmail 11512 invoked by alias); 9 Sep 2009 13:39:25 -0000 X-SWARE-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_26,SPF_HELO_PASS X-Spam-Status: No, hits=-1.9 required=5.0 tests=AWL,BAYES_00,J_CHICKENPOX_26,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on bastion2.fedora.phx.redhat.com Subject: cluster: STABLE3 - config: Record time/date rather than path To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: 64b7b036cdbb228508bbe2c3c667fc775b940c79 X-Git-Newrev: 7b104c967022cf1d1b961e65ebd9796edf485c4f From: Lon Hohberger Message-Id: <20090909133834.3EBF8120195@lists.fedorahosted.org> Date: Wed, 09 Sep 2009 13:39:00 -0000 X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 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: 2009-q3/txt/msg00327.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=7b104c967022cf1d1b961e65ebd9796edf485c4f Commit: 7b104c967022cf1d1b961e65ebd9796edf485c4f Parent: 64b7b036cdbb228508bbe2c3c667fc775b940c79 Author: Lon Hohberger AuthorDate: Wed Sep 9 09:38:01 2009 -0400 Committer: Lon Hohberger CommitterDate: Wed Sep 9 09:38:01 2009 -0400 config: Record time/date rather than path Signed-off-by: Lon Hohberger --- config/plugins/ldap/99cluster.ldif | 2 +- config/tools/ldap/rng2ldif/rng2ldif.c | 14 +++++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/config/plugins/ldap/99cluster.ldif b/config/plugins/ldap/99cluster.ldif index a894abb..5fc9ee8 100644 --- a/config/plugins/ldap/99cluster.ldif +++ b/config/plugins/ldap/99cluster.ldif @@ -1,4 +1,4 @@ -# Auto-generated from ../../xml/cluster.rng +# Auto-generated @ 2009-09-09 09:35:50 dn: cn=schema attributeTypes: ( 1.3.6.1.4.1.2312.8.1.1.15 NAME 'rhcsAlias' diff --git a/config/tools/ldap/rng2ldif/rng2ldif.c b/config/tools/ldap/rng2ldif/rng2ldif.c index 39e2cbc..ea99e8b 100644 --- a/config/tools/ldap/rng2ldif/rng2ldif.c +++ b/config/tools/ldap/rng2ldif/rng2ldif.c @@ -3,6 +3,7 @@ #include #include #include +#include #include #include @@ -126,6 +127,9 @@ write_ldap_schema(const char *rng, const char *arg, struct ldap_object_node *obj = NULL; char filename[4096]; FILE *out_ldap = NULL; + char now_asc[128]; + time_t now; + struct tm now_tm; int fd = -1; if (!strcmp(arg, "-")) { @@ -146,7 +150,15 @@ write_ldap_schema(const char *rng, const char *arg, } } - fprintf(out_ldap, "# Auto-generated from %s\n", rng); + now = time(NULL); + memset(&now_tm, 0, sizeof(now_tm)); + if (localtime_r(&now, &now_tm) == NULL) { + snprintf(now_asc, sizeof(now_asc), "???"); + } else { + strftime(now_asc, sizeof(now_asc), "%F %T", &now_tm); + } + + fprintf(out_ldap, "# Auto-generated @ %s\n", now_asc); fprintf(out_ldap, "dn: cn=schema\n"); for (attr = attrs; attr; attr = attr->next)