From 49bc8625b31191cb87276fce46695f8badfe4105 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Thu, 30 Dec 2010 16:43:28 -0500 Subject: [PATCH] use the short commit hash --- citadel/scripts/mk_svn_revision.sh | 2 +- citadel/user_ops.c | 6 +++++- webcit/static/styles/modal.css | 4 ++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/citadel/scripts/mk_svn_revision.sh b/citadel/scripts/mk_svn_revision.sh index cb8af4e04..144ffa4ab 100755 --- a/citadel/scripts/mk_svn_revision.sh +++ b/citadel/scripts/mk_svn_revision.sh @@ -25,7 +25,7 @@ if test -d $SRC_DIR/.svn ; then else if test -d $SRC_DIR/../.git ; then echo "have Git repository." - BUILD=`/usr/bin/git log -1 --pretty=%H . ` + BUILD=`/usr/bin/git log -1 --pretty=%h . ` echo "This code base git-revision: $BUILD" CAN_BUILD_SVN_REVISION="yes" else diff --git a/citadel/user_ops.c b/citadel/user_ops.c index d635f9617..1c4c9480a 100644 --- a/citadel/user_ops.c +++ b/citadel/user_ops.c @@ -812,10 +812,14 @@ void CtdlUserLogout(void) if ((CCC->user.axlevel == AxDeleted) && (CCC->user.usernum)) purge_user(CCC->user.fullname); + /* Clear out the user record in memory so we don't behave like a ghost */ + memset(&CCC->user, 0, sizeof(struct ctdluser)); + /* Free any output buffers */ unbuffer_output(); } + /* * Validate a password on the host unix system by talking to the chkpwd daemon */ @@ -825,7 +829,7 @@ static int validpw(uid_t uid, const char *pass) int rv = 0; if (IsEmptyStr(pass)) { - CtdlLogPrintf(CTDL_DEBUG, "refusing to check empty password for uid=%d using chkpwd...\n", uid); + CtdlLogPrintf(CTDL_DEBUG, "Refusing to chkpwd for uid=%d with empty password.\n", uid); return 0; } diff --git a/webcit/static/styles/modal.css b/webcit/static/styles/modal.css index 6389974b8..19fa213bf 100644 --- a/webcit/static/styles/modal.css +++ b/webcit/static/styles/modal.css @@ -33,7 +33,7 @@ display:table; height:100%; vertical-align:middle; - width:300px; + width:80%; z-index:9999; *width:100%; *text-align:center; @@ -44,7 +44,7 @@ .md-dialog-wrap { display:table-cell; vertical-align:middle; - *width:300px; + *width:80%; *text-align:left; *zoom:1; *display:inline; -- 2.30.2