9 files changed, 19 insertions, 19 deletions
diff --git a/source3/lib/util.c b/source3/lib/util.c
index 551beab867..42fa79c1be 100644
--- a/source3/lib/util.c
+++ b/source3/lib/util.c
@@ -1517,7 +1517,7 @@ static char *xx_path(const char *name, const char *rootpath)
 
 char *lock_path(const char *name)
 {
-	return xx_path(name, lp_lockdir());
+	return xx_path(name, lp_lock_directory());
 }
 
 /**
diff --git a/source3/nmbd/nmbd.c b/source3/nmbd/nmbd.c
index f31de08d53..2c1e8f0261 100644
--- a/source3/nmbd/nmbd.c
+++ b/source3/nmbd/nmbd.c
@@ -969,10 +969,10 @@ static bool open_sockets(bool isdaemon, int port)
 	}
 #endif
 
-	ok = directory_create_or_exist(lp_lockdir(), geteuid(), 0755);
+	ok = directory_create_or_exist(lp_lock_directory(), geteuid(), 0755);
 	if (!ok) {
 		DEBUG(0, ("Failed to create directory %s for lock files - %s\n",
-			  lp_lockdir(), strerror(errno)));
+			  lp_lock_directory(), strerror(errno)));
 		exit(1);
 	}
 
diff --git a/source3/nmbd/nmbd_synclists.c b/source3/nmbd/nmbd_synclists.c
index d10b580a01..19e3ed0e2b 100644
--- a/source3/nmbd/nmbd_synclists.c
+++ b/source3/nmbd/nmbd_synclists.c
@@ -157,7 +157,7 @@ done:
 	unstrcpy(s->server, name);
 	s->ip = ip;
 
-	if (asprintf(&s->fname, "%s/sync.%d", lp_lockdir(), counter++) < 0) {
+	if (asprintf(&s->fname, "%s/sync.%d", lp_lock_directory(), counter++) < 0) {
 		SAFE_FREE(s);
 		goto done;
 	}
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index c7a95e1607..a40fa8ee91 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -768,7 +768,7 @@ static void init_globals(bool reinit_globals)
 	string_set(&Globals.workgroup, DEFAULT_WORKGROUP);
 
 	string_set(&Globals.passwd_program, "");
-	string_set(&Globals.lockdir, get_dyn_LOCKDIR());
+	string_set(&Globals.lock_directory, get_dyn_LOCKDIR());
 	string_set(&Globals.szStateDir, get_dyn_STATEDIR());
 	string_set(&Globals.szCacheDir, get_dyn_CACHEDIR());
 	string_set(&Globals.piddir, get_dyn_PIDDIR());
@@ -1172,15 +1172,15 @@ static FN_GLOBAL_BOOL(_writeraw, bWriteRaw)
 
 /* If lp_statedir() and lp_cachedir() are explicitely set during the
  * build process or in smb.conf, we use that value.  Otherwise they
- * default to the value of lp_lockdir(). */
+ * default to the value of lp_lock_directory(). */
 const char *lp_statedir(void) {
 	if ((strcmp(get_dyn_STATEDIR(), get_dyn_LOCKDIR()) != 0) ||
 	    (strcmp(get_dyn_STATEDIR(), Globals.szStateDir) != 0))
 		return(*(char **)(&Globals.szStateDir) ?
 		       *(char **)(&Globals.szStateDir) : "");
 	else
-		return(*(char **)(&Globals.lockdir) ?
-		       *(char **)(&Globals.lockdir) : "");
+		return(*(char **)(&Globals.lock_directory) ?
+		       *(char **)(&Globals.lock_directory) : "");
 }
 const char *lp_cachedir(void) {
 	if ((strcmp(get_dyn_CACHEDIR(), get_dyn_LOCKDIR()) != 0) ||
@@ -1188,8 +1188,8 @@ const char *lp_cachedir(void) {
 		return(*(char **)(&Globals.szCacheDir) ?
 		       *(char **)(&Globals.szCacheDir) : "");
 	else
-		return(*(char **)(&Globals.lockdir) ?
-		       *(char **)(&Globals.lockdir) : "");
+		return(*(char **)(&Globals.lock_directory) ?
+		       *(char **)(&Globals.lock_directory) : "");
 }
 static FN_GLOBAL_INTEGER(winbind_max_domain_connections_int,
 		  winbindMaxDomainConnections)
diff --git a/source3/smbd/oplock_irix.c b/source3/smbd/oplock_irix.c
index 694ca086e3..75f34df1c2 100644
--- a/source3/smbd/oplock_irix.c
+++ b/source3/smbd/oplock_irix.c
@@ -49,7 +49,7 @@ static bool irix_oplocks_available(void)
 
 	tmpname = talloc_asprintf(ctx,
 				"%s/koplock.%d",
-				lp_lockdir(),
+				lp_lock_directory(),
 				(int)getpid());
 	if (!tmpname) {
 		TALLOC_FREE(ctx);
diff --git a/source3/smbd/process.c b/source3/smbd/process.c
index 30323a2274..6d7af26a6e 100644
--- a/source3/smbd/process.c
+++ b/source3/smbd/process.c
@@ -3088,7 +3088,7 @@ bool fork_echo_handler(struct smbd_server_connection *sconn)
 		DEBUG(1, ("pipe() failed: %s\n", strerror(errno)));
 		return false;
 	}
-	sconn->smb1.echo_handler.socket_lock_fd = create_unlink_tmp(lp_lockdir());
+	sconn->smb1.echo_handler.socket_lock_fd = create_unlink_tmp(lp_lock_directory());
 	if (sconn->smb1.echo_handler.socket_lock_fd == -1) {
 		DEBUG(1, ("Could not create lock fd: %s\n", strerror(errno)));
 		goto fail;
diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index feb47daf50..81b66b7ee0 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -1337,8 +1337,8 @@ extern void build_options(bool screen);
 		setpgid( (pid_t)0, (pid_t)0);
 #endif
 
-	if (!directory_exist(lp_lockdir()))
-		mkdir(lp_lockdir(), 0755);
+	if (!directory_exist(lp_lock_directory()))
+		mkdir(lp_lock_directory(), 0755);
 
 	if (!directory_exist(lp_piddir()))
 		mkdir(lp_piddir(), 0755);
diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index f905875a65..98806016c8 100644
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -88,14 +88,14 @@ static int do_global_checks(void)
 				"must differ.\n\n");
 	}
 
-	if (!directory_exist_stat(lp_lockdir(), &st)) {
+	if (!directory_exist_stat(lp_lock_directory(), &st)) {
 		fprintf(stderr, "ERROR: lock directory %s does not exist\n\n",
-		       lp_lockdir());
+		       lp_lock_directory());
 		ret = 1;
 	} else if ((st.st_ex_mode & 0777) != 0755) {
 		fprintf(stderr, "WARNING: lock directory %s should have "
 				"permissions 0755 for browsing to work\n\n",
-		       lp_lockdir());
+		       lp_lock_directory());
 	}
 
 	if (!directory_exist_stat(lp_statedir(), &st)) {
diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 8c480e523c..65b30d3c53 100644
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -1481,10 +1481,10 @@ int main(int argc, char **argv, char **envp)
 		exit(1);
 	}
 
-	ok = directory_create_or_exist(lp_lockdir(), geteuid(), 0755);
+	ok = directory_create_or_exist(lp_lock_directory(), geteuid(), 0755);
 	if (!ok) {
 		DEBUG(0, ("Failed to create directory %s for lock files - %s\n",
-			  lp_lockdir(), strerror(errno)));
+			  lp_lock_directory(), strerror(errno)));
 		exit(1);
 	}