rpms/samba/F-7 samba-3.0.25-imdap-basedn.patch, NONE, 1.1 .cvsignore, 1.41, 1.42 samba.spec, 1.129, 1.130 sources, 1.45, 1.46

[Simo Sorce (simo)]

Author: simo

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

Modified Files:
	.cvsignore samba.spec sources 
Added Files:
	samba-3.0.25-imdap-basedn.patch 
Log Message:

Upgrade F-7 to 25c as well



samba-3.0.25-imdap-basedn.patch:

--- NEW FILE samba-3.0.25-imdap-basedn.patch ---
diff --git a/source/nsswitch/idmap_ldap.c b/source/nsswitch/idmap_ldap.c
index ca7d32b..7c02779 100644
--- a/source/nsswitch/idmap_ldap.c
+++ b/source/nsswitch/idmap_ldap.c
@@ -287,16 +287,9 @@ static NTSTATUS idmap_ldap_alloc_init(const char *params)
 	}
 	CHECK_ALLOC_DONE( idmap_alloc_ldap->url );
 
-	tmp = lp_ldap_idmap_suffix();
+	tmp = lp_parm_const_string(-1, "idmap alloc config", "ldap_base_dn", NULL);
 	if ( ! tmp || ! *tmp) {
-		tmp = lp_parm_const_string(-1, "idmap alloc config", "ldap_base_dn", NULL);
-	}
-	if ( ! tmp) {
-		tmp = lp_ldap_suffix();
-		if (tmp) {
-			DEBUG(1, ("WARNING: Trying to use the global ldap suffix(%s)\n", tmp));
-			DEBUGADD(1, ("as suffix. This may not be what you want!\n"));
-		}
+		tmp = lp_ldap_idmap_suffix();
 		if ( ! tmp) {
 			DEBUG(1, ("ERROR: missing idmap ldap suffix\n"));
 			ret = NT_STATUS_UNSUCCESSFUL;
@@ -780,21 +773,16 @@ static NTSTATUS idmap_ldap_db_init(struct idmap_domain *dom)
 	}
 	CHECK_ALLOC_DONE(ctx->url);
 
-	tmp = lp_ldap_idmap_suffix();
-	if ( ! tmp || ! *tmp) {
-		tmp = lp_parm_const_string(-1, config_option, "ldap_base_dn", NULL);
-	}
-	if ( ! tmp) {
-		tmp = lp_ldap_suffix();
-		if (tmp) {
-			DEBUG(1, ("WARNING: Trying to use the global ldap suffix(%s)\n", tmp));
-			DEBUGADD(1, ("as suffix. This may not be what you want!\n"));
-		} else {
-			DEBUG(1, ("ERROR: missing idmap ldap suffix\n"));
-			ret = NT_STATUS_UNSUCCESSFUL;
-			goto done;
-		}		
-	}
+        tmp = lp_parm_const_string(-1, config_option, "ldap_base_dn", NULL);
+        if ( ! tmp || ! *tmp) {
+                tmp = lp_ldap_idmap_suffix();
+                if ( ! tmp) {
+                        DEBUG(1, ("ERROR: missing idmap ldap suffix\n"));
+                        ret = NT_STATUS_UNSUCCESSFUL;
+                        goto done;
+		}
+        }
+
 	ctx->suffix = talloc_strdup(ctx, tmp);
 	CHECK_ALLOC_DONE(ctx->suffix);
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-7/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore	26 Jun 2007 18:13:23 -0000	1.41
+++ .cvsignore	21 Aug 2007 13:53:11 -0000	1.42
@@ -1 +1 @@
-samba-3.0.25b.tar.gz
+samba-3.0.25c.tar.gz


Index: samba.spec
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-7/samba.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- samba.spec	16 Aug 2007 12:25:35 -0000	1.129
+++ samba.spec	21 Aug 2007 13:53:11 -0000	1.130
@@ -1,8 +1,8 @@
 Summary: The Samba Suite of programs
 Name: samba
 Epoch: 0
-Version: 3.0.25b
-Release: 2%{?dist}
+Version: 3.0.25c
+Release: 0%{?dist}
 License: GPLv2+ and LGPLv2+
 Group: System Environment/Daemons
 URL: http://www.samba.org/
@@ -41,6 +41,7 @@
 Patch110: samba-3.0.21pre1-smbspool.patch
 Patch111: samba-3.0.13-smbclient.patch
 Patch200: samba-3.0.25rc1-inotifiy.patch
+Patch210: samba-3.0.25-imdap-basedn.patch
 
 Requires(pre): samba-common = %{epoch}:%{version}-%{release}
 Requires: pam >= 0:0.64
@@ -157,6 +158,7 @@
 %patch110 -p1 -b .smbspool
 %patch111 -p1 -b .smbclient
 %patch200 -p0 -b .inotify
+%patch210 -p1 -b .idmap_basedn
 
 # crap
 rm -f examples/VFS/.cvsignore
@@ -639,6 +641,10 @@
 #%{_includedir}/libmsrpc.h
 
 %changelog
+* Tue Aug 21 2007 Simo Sorce <ssorce at redhat.com> 3.0.25c-0.fc7
+- update to 3.0.25c
+- add patch to fix samba bugzilla 4772
+
 * Tue Jun 26 2007 Simo Sorce <ssorce at redhat.com> 3.0.25b-2.fc7
 - update to 3.0.25b
 - better error codes for init scripts: #244823


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/samba/F-7/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources	26 Jun 2007 20:38:09 -0000	1.45
+++ sources	21 Aug 2007 13:53:11 -0000	1.46
@@ -1 +1 @@
-e4979a6aa6f18f0e36bacc25cab7b02d  samba-3.0.25b.tar.gz
+87950694270b86cbc1b2074cb53dd1aa  samba-3.0.25c.tar.gz