From: Steven Danneman <steven.danneman@isilon.com>
Date: Mon, 12 Jan 2009 06:44:10 +0000 (-0800)
Subject: Audit usage of get_dyn_STATEDIR() and replace with state_path()
X-Git-Tag: samba-4.0.0alpha6~127
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7b02e05eb64f3ffd7aa1cf027d10a7343c0da757;p=thirdparty%2Fsamba.git

Audit usage of get_dyn_STATEDIR() and replace with state_path()

The state directory is now run-time configurable through loadparm, so all
references to it should be done through state_path() or lp_statedir().
---

diff --git a/source3/nmbd/nmbd_winsserver.c b/source3/nmbd/nmbd_winsserver.c
index 74bed684fdd..70118063b40 100644
--- a/source3/nmbd/nmbd_winsserver.c
+++ b/source3/nmbd/nmbd_winsserver.c
@@ -2366,7 +2366,7 @@ void wins_write_database(time_t t, bool background)
 		}
 	}
 
-	if (asprintf(&fname, "%s/%s", get_dyn_STATEDIR(), WINS_LIST) < 0) {
+	if (!(fname = state_path(WINS_LIST))) {
 		goto err_exit;
 	}
 	/* This is safe as the 0 length means "don't expand". */
@@ -2394,8 +2394,8 @@ void wins_write_database(time_t t, bool background)
 
   err_exit:
 
-	SAFE_FREE(fname);
 	SAFE_FREE(fnamenew);
+	/* fname is talloced and doesn't need to be freed */
 
 	if (background) {
 		_exit(0);