svn commit: samba r25237 - in branches/SAMBA_3_2_0/source/winbindd: .

[metze at samba.org]

Author: metze
Date: 2007-09-19 17:20:16 +0000 (Wed, 19 Sep 2007)
New Revision: 25237

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

Log:
make it possible to alter WINBINDD_SOCKET_DIR via
"winbindd:socket dir=/path/to/dir" for usage in make test

metze
Modified:
   branches/SAMBA_3_2_0/source/winbindd/winbindd.c
   branches/SAMBA_3_2_0/source/winbindd/winbindd_util.c


Changeset:
Modified: branches/SAMBA_3_2_0/source/winbindd/winbindd.c
===================================================================
--- branches/SAMBA_3_2_0/source/winbindd/winbindd.c	2007-09-19 17:19:57 UTC (rev 25236)
+++ branches/SAMBA_3_2_0/source/winbindd/winbindd.c	2007-09-19 17:20:16 UTC (rev 25237)
@@ -133,7 +133,7 @@
 
 	/* Remove socket file */
 	pstr_sprintf(path, "%s/%s", 
-		 WINBINDD_SOCKET_DIR, WINBINDD_SOCKET_NAME);
+		 get_winbind_pipe_dir(), WINBINDD_SOCKET_NAME);
 	unlink(path);
 
 	idmap_close();

Modified: branches/SAMBA_3_2_0/source/winbindd/winbindd_util.c
===================================================================
--- branches/SAMBA_3_2_0/source/winbindd/winbindd_util.c	2007-09-19 17:19:57 UTC (rev 25236)
+++ branches/SAMBA_3_2_0/source/winbindd/winbindd_util.c	2007-09-19 17:20:16 UTC (rev 25237)
@@ -1159,6 +1159,11 @@
  * Winbindd socket accessor functions
  */
 
+const char *get_winbind_pipe_dir(void) 
+{
+	return lp_parm_const_string(-1, "winbindd", "socket dir", WINBINDD_SOCKET_DIR);
+}
+
 char *get_winbind_priv_pipe_dir(void) 
 {
 	return lock_path(WINBINDD_PRIV_SOCKET_SUBDIR);
@@ -1173,7 +1178,7 @@
 {
 	if (_winbindd_socket == -1) {
 		_winbindd_socket = create_pipe_sock(
-			WINBINDD_SOCKET_DIR, WINBINDD_SOCKET_NAME, 0755);
+			get_winbind_pipe_dir(), WINBINDD_SOCKET_NAME, 0755);
 		DEBUG(10, ("open_winbindd_socket: opened socket fd %d\n",
 			   _winbindd_socket));
 	}