[BACK]Return to patch-be CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / net / samba30 / patches
File: [cvs.NetBSD.org] / pkgsrc / net / samba30 / patches / Attic / patch-be (download)

Revision 1.1.1.1 (vendor branch), Thu Dec 15 22:23:24 2011 UTC (11 years, 1 month ago) by asau
Branch: TNF
CVS Tags: pkgsrc-base, pkgsrc-2012Q4-base, pkgsrc-2012Q4, pkgsrc-2012Q3-base, pkgsrc-2012Q3, pkgsrc-2012Q2-base, pkgsrc-2012Q2, pkgsrc-2012Q1-base, pkgsrc-2012Q1, pkgsrc-2011Q4-base, pkgsrc-2011Q4
Changes since 1.1: +0 -0 lines 

Reimport Samba 3.0.37 from net/samba as net/samba30 as part of Samba packages rotation.

$NetBSD: patch-be,v 1.1.1.1 2011/12/15 22:23:24 asau Exp $

--- nmbd/nmbd_winsserver.c.orig	2008-03-08 10:33:35.000000000 -0500
+++ nmbd/nmbd_winsserver.c
@@ -574,7 +574,7 @@ BOOL initialise_wins(void)
 	}
 
 	/* Open the wins.tdb. */
-	wins_tdb = tdb_open_log(lock_path("wins.tdb"), 0, TDB_DEFAULT|TDB_CLEAR_IF_FIRST, O_CREAT|O_RDWR, 0600);
+	wins_tdb = tdb_open_log(state_path("wins.tdb"), 0, TDB_DEFAULT|TDB_CLEAR_IF_FIRST, O_CREAT|O_RDWR, 0600);
 	if (!wins_tdb) {
 		DEBUG(0,("initialise_wins: failed to open wins.tdb. Error was %s\n",
 			strerror(errno) ));
@@ -585,7 +585,7 @@ BOOL initialise_wins(void)
 
 	add_samba_names_to_subnet(wins_server_subnet);
 
-	if((fp = x_fopen(lock_path(WINS_LIST),O_RDONLY,0)) == NULL) {
+	if((fp = x_fopen(state_path(WINS_LIST),O_RDONLY,0)) == NULL) {
 		DEBUG(2,("initialise_wins: Can't open wins database file %s. Error was %s\n",
 			WINS_LIST, strerror(errno) ));
 		return True;
@@ -2338,7 +2338,7 @@ void wins_write_database(time_t t, BOOL 
 		}
 	}
 
-	slprintf(fname,sizeof(fname)-1,"%s/%s", lp_lockdir(), WINS_LIST);
+	pstrcpy(fname, state_path(WINS_LIST));
 	all_string_sub(fname,"//", "/", 0);
 	slprintf(fnamenew,sizeof(fnamenew)-1,"%s.%u", fname, (unsigned int)sys_getpid());