use supplied username when locking

git-svn-id: file:///home/lennart/svn/public/fusedav/trunk@20 e35a362c-bbd6-0310-a59f-a4efcb1729c4

2 files changed, 7 insertions, 5 deletions

diff --git a/src/fusedav.c b/src/fusedav.c
index 11f7ae7..bf1d43c 100644
--- a/src/fusedav.c
+++ b/src/fusedav.c
@@ -1245,11 +1245,12 @@ static int create_lock(void) {
     if (!(session = session_get(0)))
         return -1;
 
-    if (!(owner = getenv("USER")))
-        if (!(owner = getenv("LOGNAME"))) {
-            snprintf(_owner, sizeof(_owner), "%lu", (unsigned long) getuid());
-            owner = owner;
-        }
+    if (!(owner = username))
+        if (!(owner = getenv("USER")))
+            if (!(owner = getenv("LOGNAME"))) {
+                snprintf(_owner, sizeof(_owner), "%lu", (unsigned long) getuid());
+                owner = owner;
+            }
 
     ne_fill_server_uri(session, &lock->uri);
     
diff --git a/src/session.h b/src/session.h
index 2f6a1ad..3739142 100644
--- a/src/session.h
+++ b/src/session.h
@@ -32,5 +32,6 @@ int session_is_local(const ne_uri *u);
 
 extern char *base_directory;
 extern ne_uri uri;
+extern char *username;
 
 #endif