trunk: fix winbind socket connection interface for default location of the sock_file.

Changelog

@@ -1,3 +1,5 @@
+- Fix winbind socket connection interface for default location of the
+  sock_file.
 - Add wireshark module based on ethereal module.
 - Revise upstart support in init module to use a tunable, as upstart is now
   used in Fedora too.

policy/modules/services/samba.if

@@ -484,11 +484,22 @@ interface(`samba_read_winbind_pid',`
 ## </param>
 #
 interface(`samba_stream_connect_winbind',`
-	gen_require(`
+	ifdef(`distro_redhat',`
-		type samba_var_t, winbind_t, winbind_var_run_t;
+		gen_require(`
-	')
+			type samba_var_t, winbind_t, winbind_var_run_t;
+		')
 
-	files_search_pids($1)
+		files_search_pids($1)
-	allow $1 samba_var_t:dir search_dir_perms;
+		allow $1 samba_var_t:dir search_dir_perms;
-	stream_connect_pattern($1,winbind_var_run_t,winbind_var_run_t,winbind_t)
+		stream_connect_pattern($1,winbind_var_run_t,winbind_var_run_t,winbind_t)
+	',`
+		gen_require(`
+			type winbind_t, winbind_tmp_t;
+		')
+
+		# the default for the socket is (poorly named):
+		# /tmp/.winbindd/pipe
+		files_search_tmp($1)
+		stream_connect_pattern($1,winbind_tmp_t,winbind_tmp_t,winbind_t)
+	')
 ')

policy/modules/services/samba.te

@@ -1,5 +1,5 @@
 
-policy_module(samba,1.7.1)
+policy_module(samba,1.7.2)
 
 #################################
 #