give precedence to WaklogLocationPrincipal over $KRB5CCNAME

git-svn-id: https://modwaklog.svn.sourceforge.net/svnroot/modwaklog/trunk/modwaklog@58 0d961d1b-a432-0410-8fea-cc29f225fe07

diff --git a/VERSION b/VERSION
index 8d3d63f..bc583aa 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-SVN_20070726
+SVN_20070910

diff --git a/mod_waklog.c b/mod_waklog.c
index 6d5bd69..0c126eb 100644 (file)
--- a/mod_waklog.c
+++ b/mod_waklog.c
@@ -312,7 +312,7 @@ set_auth ( server_rec *s, request_rec *r, int self, char *principal, char *keyta
        /* we'll pick this up later after we've checked the cache and current state */
              
   } else
-  if (r && r->user) {
+  if (r && r->user && !principal) {
     strncpy(k5user, r->user, sizeof(k5user));
     keytab = NULL;
   } else