rpms/samba/F-8 samba.spec, 1.138, 1.139 samba3_idmap_default_domain.patch, 1.1, 1.2

[Simo Sorce (simo)]

Author: simo

Update of /cvs/pkgs/rpms/samba/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14437

Modified Files:
	samba.spec samba3_idmap_default_domain.patch 
Log Message:
* Sun Oct 14 2007 Simo Sorce <ssorce at redhat.com> 3.0.26a-5.fc8
- Fix default domain patch turned out to be incomplete, fixed



Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-8/samba.spec,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- samba.spec	11 Oct 2007 20:25:58 -0000	1.138
+++ samba.spec	15 Oct 2007 16:22:30 -0000	1.139
@@ -2,7 +2,7 @@
 Name: samba
 Epoch: 0
 Version: 3.0.26a
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Daemons
 URL: http://www.samba.org/
@@ -645,6 +645,9 @@
 #%{_includedir}/libmsrpc.h
 
 %changelog
+* Sun Oct 14 2007 Simo Sorce <ssorce at redhat.com> 3.0.26a-5.fc8
+- Fix default domain patch turned out to be incomplete, fixed
+
 * Thu Oct 11 2007 Simo Sorce <ssorce at redhat.com> 3.0.26a-4.fc8
 - Fix idmap_rid module with compatible config syntax
 

samba3_idmap_default_domain.patch:

Index: samba3_idmap_default_domain.patch
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-8/samba3_idmap_default_domain.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- samba3_idmap_default_domain.patch	11 Oct 2007 20:25:59 -0000	1.1
+++ samba3_idmap_default_domain.patch	15 Oct 2007 16:22:30 -0000	1.2
@@ -50,6 +50,16 @@
  	}
  
  	/***************************
+@@ -389,7 +389,8 @@
+ 			continue;
+ 		}
+ 
+-		if (strequal(dom_list[i], lp_workgroup())) {
++		if ((dom_list[i] != default_domain) &&
++		    strequal(dom_list[i], lp_workgroup())) {
+ 			pri_dom_is_in_list = True;
+ 		}
+ 		/* init domain */
 @@ -398,10 +411,10 @@
  						   "default", False);