svn commit: samba r5964 - in branches/SAMBA_3_0_RELEASE:
packaging/RedHat source/nsswitch source/passdb source/utils
jerry at samba.org
jerry at samba.org
Tue Mar 22 20:28:39 GMT 2005
Author: jerry
Date: 2005-03-22 20:28:39 +0000 (Tue, 22 Mar 2005)
New Revision: 5964
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=5964
Log:
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
Modified:
branches/SAMBA_3_0_RELEASE/packaging/RedHat/samba.spec.tmpl
branches/SAMBA_3_0_RELEASE/packaging/RedHat/winbind.init
branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_group.c
branches/SAMBA_3_0_RELEASE/source/passdb/pdb_ldap.c
branches/SAMBA_3_0_RELEASE/source/utils/net_groupmap.c
branches/SAMBA_3_0_RELEASE/source/utils/net_rpc.c
Changeset:
Modified: branches/SAMBA_3_0_RELEASE/packaging/RedHat/samba.spec.tmpl
===================================================================
--- branches/SAMBA_3_0_RELEASE/packaging/RedHat/samba.spec.tmpl 2005-03-22 19:30:59 UTC (rev 5963)
+++ branches/SAMBA_3_0_RELEASE/packaging/RedHat/samba.spec.tmpl 2005-03-22 20:28:39 UTC (rev 5964)
@@ -16,8 +16,8 @@
Source999: filter-requires-samba_rh9.sh
Packager: Gerald Carter [Samba-Team] <jerry at 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 @@
--with-fhs \
--with-quotas \
--with-smbmount \
+ --enable-cups \
--with-pam \
--with-pam_smbpass \
--with-syslog \
Modified: branches/SAMBA_3_0_RELEASE/packaging/RedHat/winbind.init
===================================================================
--- branches/SAMBA_3_0_RELEASE/packaging/RedHat/winbind.init 2005-03-22 19:30:59 UTC (rev 5963)
+++ branches/SAMBA_3_0_RELEASE/packaging/RedHat/winbind.init 2005-03-22 20:28:39 UTC (rev 5964)
@@ -26,11 +26,8 @@
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 @@
}
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
Modified: branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_group.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_group.c 2005-03-22 19:30:59 UTC (rev 5963)
+++ branches/SAMBA_3_0_RELEASE/source/nsswitch/winbindd_group.c 2005-03-22 20:28:39 UTC (rev 5964)
@@ -1246,7 +1246,7 @@
* 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 */
Modified: branches/SAMBA_3_0_RELEASE/source/passdb/pdb_ldap.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/passdb/pdb_ldap.c 2005-03-22 19:30:59 UTC (rev 5963)
+++ branches/SAMBA_3_0_RELEASE/source/passdb/pdb_ldap.c 2005-03-22 20:28:39 UTC (rev 5964)
@@ -2288,7 +2288,7 @@
{
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);
}
Modified: branches/SAMBA_3_0_RELEASE/source/utils/net_groupmap.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/utils/net_groupmap.c 2005-03-22 19:30:59 UTC (rev 5963)
+++ branches/SAMBA_3_0_RELEASE/source/utils/net_groupmap.c 2005-03-22 20:28:39 UTC (rev 5964)
@@ -303,7 +303,7 @@
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;
}
Modified: branches/SAMBA_3_0_RELEASE/source/utils/net_rpc.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/utils/net_rpc.c 2005-03-22 19:30:59 UTC (rev 5963)
+++ branches/SAMBA_3_0_RELEASE/source/utils/net_rpc.c 2005-03-22 20:28:39 UTC (rev 5964)
@@ -1009,7 +1009,7 @@
/* 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 @@
for (i = 0; i < num_names; i++)
printf("%s\n", names[i]);
}
- else {
- printf("no groups\n");
- }
done:
return result;
}
More information about the samba-cvs
mailing list