r5964: merging some fixes for 3.0.13

svn merge -r5880:5884 $SVNURL/branches/SAMBA_3_0
svn merge -r5884:5888 $SVNURL/branches/SAMBA_3_0
svn merge -r5916:5918 $SVNURL/branches/SAMBA_3_0
svn merge -r5926:5927 $SVNURL/branches/SAMBA_3_0
svn merge -r5944:5945 $SVNURL/branches/SAMBA_3_0

6 files changed, 11 insertions, 19 deletions

diff --git a/packaging/RedHat/samba.spec.tmpl b/packaging/RedHat/samba.spec.tmpl
index d5124d05edb..dc15a5acc3e 100644
--- a/packaging/RedHat/samba.spec.tmpl
+++ b/packaging/RedHat/samba.spec.tmpl
@@ -16,8 +16,8 @@ Source998: filter-requires-samba_rh8.sh
 Source999: filter-requires-samba_rh9.sh
 
 Packager: Gerald Carter [Samba-Team] <jerry@samba.org>
-Requires: pam openldap krb5-libs 
-BuildRequires: openldap-devel krb5-devel pam-devel
+Requires: pam openldap krb5-libs cups
+BuildRequires: openldap-devel krb5-devel pam-devel cups-devel
 Prereq: chkconfig fileutils /sbin/ldconfig
 Provides: samba = %{version}
 Obsoletes: samba-common, samba-client, samba-swat
@@ -90,6 +90,7 @@ CFLAGS="$RPM_OPT_FLAGS $EXTRA" ./configure \
 	--with-fhs \
 	--with-quotas \
 	--with-smbmount \
+	--enable-cups \
 	--with-pam \
 	--with-pam_smbpass \
 	--with-syslog \
diff --git a/packaging/RedHat/winbind.init b/packaging/RedHat/winbind.init
index 1635dca93be..289ca590834 100644
--- a/packaging/RedHat/winbind.init
+++ b/packaging/RedHat/winbind.init
@@ -26,11 +26,8 @@ CONFIG=/etc/samba/smb.conf
 
 start() {
 	echo -n "Starting Winbind services: "
-	RETVAL=1
-	if [ "`egrep -i '(idmap.*uid|winbind.*uid)' $CONFIG | egrep -v [\#\;]`" ]; then
-		daemon winbindd 
-		RETVAL=$?
-	fi
+	daemon winbindd 
+	RETVAL=$?
 	echo
 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/winbind || \
 	   RETVAL=1
@@ -38,11 +35,8 @@ start() {
 }	
 stop() {
 	echo -n "Shutting down Winbind services: "
-	RETVAL=1
-	if [ "`egrep -i '(idmap.*uid|winbind.*uid)' $CONFIG | egrep -v [\#\;]`" ]; then
-		killproc winbindd
-		RETVAL=$?
-	fi
+	killproc winbindd
+	RETVAL=$?
 	echo
 	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/winbind
 	return $RETVAL
diff --git a/source/nsswitch/winbindd_group.c b/source/nsswitch/winbindd_group.c
index 502a4b85841..1af9daae46e 100644
--- a/source/nsswitch/winbindd_group.c
+++ b/source/nsswitch/winbindd_group.c
@@ -1246,7 +1246,7 @@ enum winbindd_result winbindd_getusersids(struct winbindd_cli_state *state)
 	 * domain also asks for this info. -- vl */
 
 	if (!IS_DC) {
-		uint32_t *alias_rids = NULL;
+		uint32 *alias_rids = NULL;
 		int num_aliases;
 
 		/* We need to include the user SID to expand */
diff --git a/source/passdb/pdb_ldap.c b/source/passdb/pdb_ldap.c
index f086b3f09b2..3dab919cb46 100644
--- a/source/passdb/pdb_ldap.c
+++ b/source/passdb/pdb_ldap.c
@@ -2288,7 +2288,7 @@ static NTSTATUS ldapsam_enum_group_members(struct pdb_methods *methods,
 
 	{
 		const char *attrs[] = { "memberUid", NULL };
-		rc = smbldap_search(conn, lp_ldap_user_suffix(),
+		rc = smbldap_search(conn, lp_ldap_group_suffix(),
 				    LDAP_SCOPE_SUBTREE, filter, attrs, 0,
 				    &msg);
 	}
diff --git a/source/utils/net_groupmap.c b/source/utils/net_groupmap.c
index 158c006d1c0..a63e8176f8a 100644
--- a/source/utils/net_groupmap.c
+++ b/source/utils/net_groupmap.c
@@ -303,7 +303,7 @@ static int net_groupmap_add(int argc, const char **argv)
 		return -1;
 	}
 
-	d_printf("Successully added group %s to the mapping db\n", ntgroup);
+	d_printf("Successfully added group %s to the mapping db\n", ntgroup);
 	return 0;
 }
 
diff --git a/source/utils/net_rpc.c b/source/utils/net_rpc.c
index 1a5e98b34e9..27cc2a09186 100644
--- a/source/utils/net_rpc.c
+++ b/source/utils/net_rpc.c
@@ -1009,7 +1009,7 @@ rpc_user_info_internals(const DOM_SID *domain_sid, const char *domain_name,
 
 	/* Look up rids */
 
-	if (rids) {
+	if (num_rids) {
 		rids = TALLOC_ARRAY(mem_ctx, uint32, num_rids);
 
 		for (i = 0; i < num_rids; i++)
@@ -1028,9 +1028,6 @@ rpc_user_info_internals(const DOM_SID *domain_sid, const char *domain_name,
 		for (i = 0; i < num_names; i++)
 			printf("%s\n", names[i]);
 	}
-	else {
-		printf("no groups\n");
-	}
  done:
 	return result;
 }