svn commit: samba r12286 - in branches/SAMBA_4_0/source/lib: .

[metze]

Author: metze
Date: 2005-12-16 12:49:51 +0000 (Fri, 16 Dec 2005)
New Revision: 12286

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=12286

Log:
handle absolute path and url in lock_path() as in private_path()

metze
Modified:
   branches/SAMBA_4_0/source/lib/util.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/util.c
===================================================================
--- branches/SAMBA_4_0/source/lib/util.c        2005-12-16 11:54:05 UTC (rev 
12285)
+++ branches/SAMBA_4_0/source/lib/util.c        2005-12-16 12:49:51 UTC (rev 
12286)
@@ -610,6 +610,12 @@
 char *lock_path(TALLOC_CTX* mem_ctx, const char *name)
 {
        char *fname, *dname;
+       if (name == NULL) {
+               return NULL;
+       }
+       if (name[0] == 0 || name[0] == '/' || strstr(name, ":/")) {
+               return talloc_strdup(mem_ctx, name);
+       }
 
        dname = talloc_strdup(mem_ctx, lp_lockdir());
        trim_string(dname,"","/");