From b429ae967314941520ae4b630020474afd5d2197 Mon Sep 17 00:00:00 2001 From: clunis Date: Wed, 7 Aug 2002 04:11:20 +0000 Subject: [PATCH] simple version tracking added. git-svn-id: https://modwaklog.svn.sourceforge.net/svnroot/modwaklog/trunk/modwaklog@6 0d961d1b-a432-0410-8fea-cc29f225fe07 --- Makefile | 8 +++++++- VERSION | 1 + mod_afs.c | 24 +++++++++++++++++++----- version.c | 6 ++++++ 4 files changed, 33 insertions(+), 6 deletions(-) create mode 100644 VERSION create mode 100644 version.c diff --git a/Makefile b/Makefile index 357e4d1..d9ee264 100644 --- a/Makefile +++ b/Makefile @@ -10,10 +10,16 @@ LIB= -L/usr/local/krb5/lib \ -L/usr/local/openafs/lib/afs -lsys \ -L/usr/local/openafs/lib -lrx -llwp CFLAGS= ${DEF} ${INC} -DEAPI -OBJ= mod_afs.o lifetime.o +OBJ= mod_afs.o lifetime.o version.o all: ${ALL} +version.o : version.c + date +%Y%m%d > VERSION + ${CC} ${CFLAGS} \ + -DVERSION=\"`cat VERSION`\" \ + -c version.c + mod_afs.so: ${OBJ} ${APXS} -c ${LIB} ${OBJ} diff --git a/VERSION b/VERSION new file mode 100644 index 0000000..d907add --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +20020806 diff --git a/mod_afs.c b/mod_afs.c index 7010090..c593a6f 100644 --- a/mod_afs.c +++ b/mod_afs.c @@ -20,6 +20,16 @@ struct ClearToken { long EndTimestamp; }; + static void +afs_init( server_rec *s, pool *p ) +{ + extern char *version; + + ap_log_error( APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, s, + "mod_afs: version %s initialized.", version ); + return; +} + static void pioctl_cleanup( void *data ) @@ -70,10 +80,14 @@ get_afs_tokens( request_rec *r ) return OK; } - ap_log_error( APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server, "%s.%s@%s\n", cr.service, cr.instance, cr.realm ); - ap_log_error( APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server, "%d %d %d\n", cr.lifetime, cr.kvno, cr.issue_date ); - ap_log_error( APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server, "%s %s\n", cr.pname, cr.pinst ); - ap_log_error( APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server, "%d\n", cr.ticket_st.length ); + ap_log_error( APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server, + "%s.%s@%s\n", cr.service, cr.instance, cr.realm ); + ap_log_error( APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server, + "%d %d %d\n", cr.lifetime, cr.kvno, cr.issue_date ); + ap_log_error( APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server, + "%s %s\n", cr.pname, cr.pinst ); + ap_log_error( APLOG_MARK, APLOG_NOERRNO|APLOG_DEBUG, r->server, + "%d\n", cr.ticket_st.length ); s = buf; memmove( s, &cr.ticket_st.length, sizeof( int )); @@ -121,7 +135,7 @@ ap_log_error( APLOG_MARK, APLOG_ERR, r->server, "done with token stuff\n" ); module MODULE_VAR_EXPORT afs_module = { STANDARD_MODULE_STUFF, - NULL, /* module initializer */ + afs_init, /* module initializer */ NULL, /* create per-dir config structures */ NULL, /* merge per-dir config structures */ NULL, /* create per-server config structures */ diff --git a/version.c b/version.c new file mode 100644 index 0000000..9d8b92b --- /dev/null +++ b/version.c @@ -0,0 +1,6 @@ +/* +* Copyright (c) 2002 Regents of The University of Michigan. +* All Rights Reserved. See COPYRIGHT. +*/ + +char *version = VERSION; -- 2.20.1