[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via dbd930c socket_wrapper/py_socket_wrapper.c - include Python 2.4 compatiblity code from 82b1702 Remove rawmemchr calls - found by Ira Cooper. These are glibc-specific calls, makes us completely non-portable. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit dbd930cb243d33c84fce8dfff84fde02d9e792f5 Author: Matthias Dieter Wallnöfer m...@samba.org Date: Sat Nov 19 12:59:01 2011 +0100 socket_wrapper/py_socket_wrapper.c - include Python 2.4 compatiblity code Autobuild-User: Matthias Dieter Wallnöfer m...@samba.org Autobuild-Date: Sat Nov 19 14:53:43 CET 2011 on sn-devel-104 --- Summary of changes: lib/socket_wrapper/py_socket_wrapper.c |7 +++ 1 files changed, 7 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/socket_wrapper/py_socket_wrapper.c b/lib/socket_wrapper/py_socket_wrapper.c index 405a43a..5c8af03 100644 --- a/lib/socket_wrapper/py_socket_wrapper.c +++ b/lib/socket_wrapper/py_socket_wrapper.c @@ -45,6 +45,13 @@ #include system/network.h #include socket_wrapper.h +/* There's no Py_ssize_t in 2.4, apparently */ +#if PY_MAJOR_VERSION == 2 PY_MINOR_VERSION 5 +typedef int Py_ssize_t; +typedef inquiry lenfunc; +typedef intargfunc ssizeargfunc; +#endif + #ifndef Py_RETURN_NONE #define Py_RETURN_NONE return Py_INCREF(Py_None), Py_None #endif -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 6d29581 s4-dsdb: Modify the repl_meta_data behavior to allow
Metadata change on attribute interSiteTopologyGenerator even if the value
didn't change
from dbd930c socket_wrapper/py_socket_wrapper.c - include Python 2.4
compatiblity code
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 6d2958163746058f0400998cd1ff070ae80b206d
Author: Matthieu Patou m...@matws.net
Date: Sat Nov 19 00:37:27 2011 +0100
s4-dsdb: Modify the repl_meta_data behavior to allow Metadata change on
attribute interSiteTopologyGenerator even if the value didn't change
Autobuild-User: Matthieu Patou m...@samba.org
Autobuild-Date: Sat Nov 19 16:47:53 CET 2011 on sn-devel-104
---
Summary of changes:
source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 10 --
1 files changed, 8 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index b7a6a70..eb5d036 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -1092,9 +1092,15 @@ static int replmd_update_rpmd_element(struct ldb_context
*ldb,
return LDB_SUCCESS;
}
- /* if the attribute's value haven't changed then return LDB_SUCCESS
*/
+ /* if the attribute's value haven't changed then return LDB_SUCCESS
+* Unless we have the provision control or if the attribute is
+* interSiteTopologyGenerator as this page explain:
http://support.microsoft.com/kb/224815
+* this attribute is periodicaly written by the DC responsible for the
intersite generation
+* in a given site
+*/
if (old_el != NULL ldb_msg_element_compare(el, old_el) == 0) {
- if (!ldb_request_get_control(req, LDB_CONTROL_PROVISION_OID)) {
+ if (strcmp(el-name, interSiteTopologyGenerator) != 0
+ !ldb_request_get_control(req, LDB_CONTROL_PROVISION_OID)) {
/*
* allow this to make it possible for dbcheck
* to rebuild broken metadata
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via b0e5fb6 s3/packaging: Fix rpm build issues on RHEL4.
via f89cdef s3/packaging: Fix rpm build issues on RHEL.
from 5935630 Fix bug #8562 - talloc: double free error.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit b0e5fb69df8b66544afc29d0b3dac5454d04fe3e
Author: Karolin Seeger ksee...@samba.org
Date: Thu Nov 17 21:23:09 2011 +0100
s3/packaging: Fix rpm build issues on RHEL4.
Second part of a fix for bug #7705 (RHEL samba.spec broken - and fix).
Based on patches of Jason Haar and Daniël van Eeden. Thanks a lot!
Karolin
Autobuild-User: Karolin Seeger ksee...@samba.org
Autobuild-Date: Fri Nov 18 22:13:06 CET 2011 on sn-devel-104
(cherry picked from commit 1d471ee393b0a0c1f9cc4256217acabcd98a5dbf)
commit f89cdef51633402006dcad17b49e596a41905a40
Author: Karolin Seeger ksee...@samba.org
Date: Thu Nov 17 21:02:30 2011 +0100
s3/packaging: Fix rpm build issues on RHEL.
Fix bug #7705 (RHEL samba.spec broken - and fix).
Based on patches of Jason Haar and Daniël van Eeden. Thanks a lot!
Karolin
Autobuild-User: Karolin Seeger ksee...@samba.org
Autobuild-Date: Thu Nov 17 23:05:28 CET 2011 on sn-devel-104
(cherry picked from commit 32e825d60df26fa1d4cf5c8c7cb37ca0523847ca)
---
Summary of changes:
packaging/RHEL/samba.spec.tmpl | 43 ---
1 files changed, 18 insertions(+), 25 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index ab10f23..152bad7 100644
--- a/packaging/RHEL/samba.spec.tmpl
+++ b/packaging/RHEL/samba.spec.tmpl
@@ -1,5 +1,11 @@
%define initdir %{_sysconfdir}/rc.d/init.d
%define auth %(test -f /etc/pam.d/system-auth echo /etc/pam.d/system-auth
|| echo)
+%define this_is_redhat %(test -e /etc/redhat-release echo 1 || echo 0)
+%if %{this_is_redhat} 0
+%define rhel_ver %(lsb_release -sr)
+%else
+%define rhel_ver 0
+%endif
Summary: Samba SMB client and server
Vendor: Samba Team
@@ -28,7 +34,13 @@ Provides: samba = %{version}
Prefix: /usr
BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel,
openldap-devel, krb5-devel, cups-devel, keyutils-devel
+BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel,
openldap-devel, krb5-devel, cups-devel
+
+%if %{rhel_ver} 4
+BuildRequires: keyutils-libs-devel
+%else
+BuildRequires: keyutils-devel
+%endif
# Working around perl dependency problem from docs
%define __perl_requires %{SOURCE998}
@@ -233,12 +245,8 @@ install -m644 setup/samba.pamd
$RPM_BUILD_ROOT%{_sysconfdir}/pam.d/samba
install -m755 setup/smbprint $RPM_BUILD_ROOT%{_bindir}
install -m644 setup/smbusers $RPM_BUILD_ROOT%{_sysconfdir}/samba/smbusers
install -m644 setup/smb.conf $RPM_BUILD_ROOT%{_sysconfdir}/samba/smb.conf
-install -m755 source3/bin/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
-install -m755 source3/bin/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
install -m755 source3/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
-/bin/rm $RPM_BUILD_ROOT%{_sbindir}/*mount.cifs
-
ln -s ../..%{initdir}/smb $RPM_BUILD_ROOT%{_sbindir}/samba
ln -s ../..%{initdir}/winbind $RPM_BUILD_ROOT%{_sbindir}/winbind
@@ -331,9 +339,11 @@ fi
%{_bindir}/mksmbpasswd.sh
%{_bindir}/smbcontrol
%{_bindir}/smbstatus
+%{_bindir}/smbta-util
%{_bindir}/tdbbackup
%{_bindir}/tdbtool
%{_bindir}/tdbdump
+%{_bindir}/tdbrestore
%{_bindir}/wbinfo
%{_bindir}/ntlm_auth
%{_bindir}/pdbedit
@@ -392,9 +402,6 @@ fi
%files client
%defattr(-,root,root)
-/sbin/mount.cifs
-/sbin/umount.cifs
-%{_sbindir}/cifs.upcall
%{_bindir}/rpcclient
%{_bindir}/smbcacls
@@ -410,9 +417,6 @@ fi
%{_bindir}/net
%{_bindir}/smbtree
-%{_mandir}/man8/mount.cifs.8.*
-%{_mandir}/man8/umount.cifs.8.*
-%{_mandir}/man8/cifs.upcall.8.*
%{_mandir}/man8/smbspool.8*
%{_mandir}/man1/smbget.1*
%{_mandir}/man5/smbgetrc.5*
@@ -441,6 +445,7 @@ fi
%attr(755,root,root) /%{_libarch}/libnss_winbind.so*
%attr(755,root,root) /%{_libarch}/security/pam_winbind.so
%attr(755,root,root) /%{_libarch}/security/pam_smbpass.so
+/usr/share/locale/de/LC_MESSAGES/net.mo
/usr/share/locale/de/LC_MESSAGES/pam_winbind.mo
/usr/share/locale/ar/LC_MESSAGES/pam_winbind.mo
/usr/share/locale/cs/LC_MESSAGES/pam_winbind.mo
@@ -483,28 +488,16 @@ fi
%{_bindir}/smbpasswd
%{_bindir}/profiles
-%{_bindir}/ldbadd
-%{_bindir}/ldbdel
-%{_bindir}/ldbedit
-%{_bindir}/ldbmodify
-%{_bindir}/ldbrename
-%{_bindir}/ldbsearch
-
%{_mandir}/man1/profiles.1*
%{_mandir}/man1/testparm.1*
%{_mandir}/man5/smb.conf.5*
%{_mandir}/man5/lmhosts.5*
%{_mandir}/man8/smbpasswd.8*
+%{_mandir}/man5/pam_winbind.conf.5.*
%{_mandir}/man7/libsmbclient.7*
+%{_mandir}/man8/smbta-util.8*
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated
via 4efc4fc s3/packaging: Fix rpm build issues on RHEL4.
via 3862b12 s3/packaging: Fix rpm build issues on RHEL.
from 2bdf872 s3:libsmb: consistently use state-size in
cli_write_andx_create() (bug #5326)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit 4efc4fc9a77fe94a9513bcbfc3a24878783ee3f1
Author: Karolin Seeger ksee...@samba.org
Date: Thu Nov 17 21:23:09 2011 +0100
s3/packaging: Fix rpm build issues on RHEL4.
Second part of a fix for bug #7705 (RHEL samba.spec broken - and fix).
Based on patches of Jason Haar and Daniël van Eeden. Thanks a lot!
Karolin
Autobuild-User: Karolin Seeger ksee...@samba.org
Autobuild-Date: Fri Nov 18 22:13:06 CET 2011 on sn-devel-104
(cherry picked from commit 1d471ee393b0a0c1f9cc4256217acabcd98a5dbf)
(cherry picked from commit b0e5fb69df8b66544afc29d0b3dac5454d04fe3e)
commit 3862b127bae80ed62a3a6c2ca4e43a7f58623d5b
Author: Karolin Seeger ksee...@samba.org
Date: Thu Nov 17 21:02:30 2011 +0100
s3/packaging: Fix rpm build issues on RHEL.
Fix bug #7705 (RHEL samba.spec broken - and fix).
Based on patches of Jason Haar and Daniël van Eeden. Thanks a lot!
Karolin
Autobuild-User: Karolin Seeger ksee...@samba.org
Autobuild-Date: Thu Nov 17 23:05:28 CET 2011 on sn-devel-104
(cherry picked from commit 32e825d60df26fa1d4cf5c8c7cb37ca0523847ca)
(cherry picked from commit f89cdef51633402006dcad17b49e596a41905a40)
---
Summary of changes:
packaging/RHEL/samba.spec.tmpl | 43 ---
1 files changed, 18 insertions(+), 25 deletions(-)
Changeset truncated at 500 lines:
diff --git a/packaging/RHEL/samba.spec.tmpl b/packaging/RHEL/samba.spec.tmpl
index ab10f23..152bad7 100644
--- a/packaging/RHEL/samba.spec.tmpl
+++ b/packaging/RHEL/samba.spec.tmpl
@@ -1,5 +1,11 @@
%define initdir %{_sysconfdir}/rc.d/init.d
%define auth %(test -f /etc/pam.d/system-auth echo /etc/pam.d/system-auth
|| echo)
+%define this_is_redhat %(test -e /etc/redhat-release echo 1 || echo 0)
+%if %{this_is_redhat} 0
+%define rhel_ver %(lsb_release -sr)
+%else
+%define rhel_ver 0
+%endif
Summary: Samba SMB client and server
Vendor: Samba Team
@@ -28,7 +34,13 @@ Provides: samba = %{version}
Prefix: /usr
BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel,
openldap-devel, krb5-devel, cups-devel, keyutils-devel
+BuildRequires: pam-devel, readline-devel, fileutils, libacl-devel,
openldap-devel, krb5-devel, cups-devel
+
+%if %{rhel_ver} 4
+BuildRequires: keyutils-libs-devel
+%else
+BuildRequires: keyutils-devel
+%endif
# Working around perl dependency problem from docs
%define __perl_requires %{SOURCE998}
@@ -233,12 +245,8 @@ install -m644 setup/samba.pamd
$RPM_BUILD_ROOT%{_sysconfdir}/pam.d/samba
install -m755 setup/smbprint $RPM_BUILD_ROOT%{_bindir}
install -m644 setup/smbusers $RPM_BUILD_ROOT%{_sysconfdir}/samba/smbusers
install -m644 setup/smb.conf $RPM_BUILD_ROOT%{_sysconfdir}/samba/smb.conf
-install -m755 source3/bin/mount.cifs $RPM_BUILD_ROOT/sbin/mount.cifs
-install -m755 source3/bin/umount.cifs $RPM_BUILD_ROOT/sbin/umount.cifs
install -m755 source3/script/mksmbpasswd.sh $RPM_BUILD_ROOT%{_bindir}
-/bin/rm $RPM_BUILD_ROOT%{_sbindir}/*mount.cifs
-
ln -s ../..%{initdir}/smb $RPM_BUILD_ROOT%{_sbindir}/samba
ln -s ../..%{initdir}/winbind $RPM_BUILD_ROOT%{_sbindir}/winbind
@@ -331,9 +339,11 @@ fi
%{_bindir}/mksmbpasswd.sh
%{_bindir}/smbcontrol
%{_bindir}/smbstatus
+%{_bindir}/smbta-util
%{_bindir}/tdbbackup
%{_bindir}/tdbtool
%{_bindir}/tdbdump
+%{_bindir}/tdbrestore
%{_bindir}/wbinfo
%{_bindir}/ntlm_auth
%{_bindir}/pdbedit
@@ -392,9 +402,6 @@ fi
%files client
%defattr(-,root,root)
-/sbin/mount.cifs
-/sbin/umount.cifs
-%{_sbindir}/cifs.upcall
%{_bindir}/rpcclient
%{_bindir}/smbcacls
@@ -410,9 +417,6 @@ fi
%{_bindir}/net
%{_bindir}/smbtree
-%{_mandir}/man8/mount.cifs.8.*
-%{_mandir}/man8/umount.cifs.8.*
-%{_mandir}/man8/cifs.upcall.8.*
%{_mandir}/man8/smbspool.8*
%{_mandir}/man1/smbget.1*
%{_mandir}/man5/smbgetrc.5*
@@ -441,6 +445,7 @@ fi
%attr(755,root,root) /%{_libarch}/libnss_winbind.so*
%attr(755,root,root) /%{_libarch}/security/pam_winbind.so
%attr(755,root,root) /%{_libarch}/security/pam_smbpass.so
+/usr/share/locale/de/LC_MESSAGES/net.mo
/usr/share/locale/de/LC_MESSAGES/pam_winbind.mo
/usr/share/locale/ar/LC_MESSAGES/pam_winbind.mo
/usr/share/locale/cs/LC_MESSAGES/pam_winbind.mo
@@ -483,28 +488,16 @@ fi
%{_bindir}/smbpasswd
%{_bindir}/profiles
-%{_bindir}/ldbadd
-%{_bindir}/ldbdel
-%{_bindir}/ldbedit
-%{_bindir}/ldbmodify
-%{_bindir}/ldbrename
-%{_bindir}/ldbsearch
-
%{_mandir}/man1/profiles.1*
%{_mandir}/man1/testparm.1*
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via d809158 s3: allow to set TCP_NODELAYACK socket option on AIX (#8616)
from b0e5fb6 s3/packaging: Fix rpm build issues on RHEL4.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit d8091581f7e55a8147c9ec5e8a30481596093d27
Author: Björn Jacke b...@sernet.de
Date: Fri Nov 18 13:40:17 2011 +0100
s3: allow to set TCP_NODELAYACK socket option on AIX (#8616)
this is the AIX way to disable delayed ACKs, the same like TCP_QUICKACK on
Linux
this is a backport of 383a918322c1edd1977fdbce19e52e8c8e6ffac1
---
Summary of changes:
source3/lib/util_sock.c |3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index 6ba1ab9..40e6e04 100644
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -137,6 +137,9 @@ static const smb_socket_option socket_options[] = {
#ifdef TCP_QUICKACK
{TCP_QUICKACK, IPPROTO_TCP, TCP_QUICKACK, 0, OPT_BOOL},
#endif
+#ifdef TCP_NODELAYACK
+ {TCP_NODELAYACK, IPPROTO_TCP, TCP_NODELAYACK, 0, OPT_BOOL},
+#endif
#ifdef TCP_KEEPALIVE_THRESHOLD
{TCP_KEEPALIVE_THRESHOLD, IPPROTO_TCP, TCP_KEEPALIVE_THRESHOLD, 0,
OPT_INT},
#endif
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated via 3651471 lib/util/ Fix crash bug caused by gfree_debug() from d809158 s3: allow to set TCP_NODELAYACK socket option on AIX (#8616) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test - Log - commit 3651471288ebd05108c9cd7f1bdbb844829244fb Author: Andrew Bartlett abart...@samba.org Date: Mon May 9 17:43:45 2011 +0200 lib/util/ Fix crash bug caused by gfree_debug() The issue is that we should reset the debug_num_classes to 0 when we un-initialise the debug system. Andrew Bartlett (cherry picked from commit 5db0cd55d4db9cc71f32dc0097e2f014c22967bc) Fix bug #8623 (Crash when trying to browse samba printers). --- Summary of changes: lib/util/debug.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/lib/util/debug.c b/lib/util/debug.c index 2ff7cb2..108161e 100644 --- a/lib/util/debug.c +++ b/lib/util/debug.c @@ -202,7 +202,7 @@ void gfree_debugsyms(void) TALLOC_FREE(format_bufr); - debug_num_classes = DBGC_MAX_FIXED; + debug_num_classes = 0; state.initialized = false; } -- Samba Shared Repository
