[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 773182f s3-passdb: Remove #if _SAMBA_BUILD_ == 4 from pdb_samba4
via 2c04520 s3-docs: Remove references to long-gone smbmount utilities
via e4546f5 auth: rename ntlmssp.c to ntlmssp_util.c
via 89cd086 s3-auth Add const to make_user_info_map
via 76021cc s4-messaging: fix pymessaging docstring
via ff5a337 s3-build use common VERSION file for all builds
from 75628e6 pidl: add more mapped types
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 773182f186f218b45abd84b996b37f27a07e2660
Author: Andrew Bartlett abart...@samba.org
Date: Wed Feb 8 17:41:54 2012 +1100
s3-passdb: Remove #if _SAMBA_BUILD_ == 4 from pdb_samba4
pdb_samba4 is only built with waf anyway.
Andrew Bartlett
Autobuild-User: Andrew Bartlett abart...@samba.org
Autobuild-Date: Wed Feb 8 09:17:40 CET 2012 on sn-devel-104
commit 2c04520f328aec22c12dc79f4712b14471118b1b
Author: Andrew Bartlett abart...@samba.org
Date: Fri Feb 3 14:51:59 2012 +1100
s3-docs: Remove references to long-gone smbmount utilities
commit e4546f50feb6e93775ad20e153b8156eb60a6a57
Author: Andrew Bartlett abart...@samba.org
Date: Tue Jan 31 08:54:22 2012 +1100
auth: rename ntlmssp.c to ntlmssp_util.c
commit 89cd086561bdf5741ad96e6c63780e4d229e8699
Author: Andrew Bartlett abart...@samba.org
Date: Mon Jan 30 22:44:28 2012 +1100
s3-auth Add const to make_user_info_map
commit 76021cc6264f1b33470ee2550bd408735686dc53
Author: Andrew Bartlett abart...@samba.org
Date: Mon Feb 6 17:44:34 2012 +1100
s4-messaging: fix pymessaging docstring
commit ff5a337483cd9f212fa0fd0931b3fa12797f55f8
Author: Andrew Bartlett abart...@samba.org
Date: Mon Jul 4 10:14:27 2011 +1000
s3-build use common VERSION file for all builds
There is no need to have both version files at this point.
Andrew Bartlett
---
Summary of changes:
auth/ntlmssp/{ntlmssp.c = ntlmssp_util.c} |0
auth/ntlmssp/wscript_build |2 +-
docs-xml/manpages-3/samba.7.xml| 10 ---
docs-xml/using_samba/ch02.xml |6 --
packaging/SGI/mkman|3 -
source3/Makefile.in|2 +-
source3/VERSION| 105
source3/auth/auth_util.c |4 +-
source3/auth/proto.h |4 +-
source3/passdb/pdb_samba4.c|2 -
source3/po/ru/help/welcome.html|3 -
source3/script/mkversion.sh|2 +-
source4/lib/messaging/pymessaging.c|5 +-
swat/help/welcome.html |3 -
swat/lang/ja/help/welcome.html |3 -
swat/lang/tr/help/welcome.html |3 -
16 files changed, 9 insertions(+), 148 deletions(-)
rename auth/ntlmssp/{ntlmssp.c = ntlmssp_util.c} (100%)
delete mode 100644 source3/VERSION
Changeset truncated at 500 lines:
diff --git a/auth/ntlmssp/ntlmssp.c b/auth/ntlmssp/ntlmssp_util.c
similarity index 100%
rename from auth/ntlmssp/ntlmssp.c
rename to auth/ntlmssp/ntlmssp_util.c
diff --git a/auth/ntlmssp/wscript_build b/auth/ntlmssp/wscript_build
index 16c31ac..e68c4c8 100644
--- a/auth/ntlmssp/wscript_build
+++ b/auth/ntlmssp/wscript_build
@@ -1,3 +1,3 @@
bld.SAMBA_SUBSYSTEM('NTLMSSP_COMMON',
-source='gensec_ntlmssp.c ntlmssp.c ntlmssp_ndr.c
ntlmssp_server.c ntlmssp_sign.c',
+source='gensec_ntlmssp.c ntlmssp_util.c ntlmssp_ndr.c
ntlmssp_server.c ntlmssp_sign.c',
deps='samba-util NDR_NTLMSSP MSRPC_PARSE NTLM_CHECK')
diff --git a/docs-xml/manpages-3/samba.7.xml b/docs-xml/manpages-3/samba.7.xml
index 2a76dff..95cbf07 100644
--- a/docs-xml/manpages-3/samba.7.xml
+++ b/docs-xml/manpages-3/samba.7.xml
@@ -244,16 +244,6 @@
/para/listitem/varlistentry
varlistentry
- term
-citerefentryrefentrytitlesmbmount/refentrytitlemanvolnum8/manvolnum/citerefentry,
-citerefentryrefentrytitlesmbumount/refentrytitlemanvolnum8/manvolnum/citerefentry,
-citerefentryrefentrytitlesmbmnt/refentrytitlemanvolnum8/manvolnum/citerefentry/term
-
listitemparacommandsmbmount/command,commandsmbumount/command and
commandsmbmnt/command are commands that can be used to
- mount CIFS/SMB shares on Linux.
- /para/listitem
- /varlistentry
-
- varlistentry
termciterefentryrefentrytitlesmbcquotas/refentrytitle
manvolnum1/manvolnum/citerefentry/term
listitemparacommandsmbcquotas/command is a tool that
diff --git a/docs-xml/using_samba/ch02.xml b/docs-xml/using_samba/ch02.xml
index 307f5f3..ad4b51c 100644
---
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 24ed8c5 regshell: Fix a counter that can actually be non-zero. from 773182f s3-passdb: Remove #if _SAMBA_BUILD_ == 4 from pdb_samba4 http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 24ed8c59244de695e370055fa3a1af418029d8b9 Author: Jelmer Vernooij jel...@samba.org Date: Wed Feb 8 14:17:17 2012 +0100 regshell: Fix a counter that can actually be non-zero. This was a regression caused by one of the unsigned patches. Autobuild-User: Jelmer Vernooij jel...@samba.org Autobuild-Date: Wed Feb 8 16:00:22 CET 2012 on sn-devel-104 --- Summary of changes: source4/lib/registry/tools/regshell.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/lib/registry/tools/regshell.c b/source4/lib/registry/tools/regshell.c index 6bd7fd3..1a4067b 100644 --- a/source4/lib/registry/tools/regshell.c +++ b/source4/lib/registry/tools/regshell.c @@ -428,7 +428,7 @@ static char **reg_complete_command(const char *text, int start, int end) /* Complete command */ char **matches; size_t len, samelen=0; - unsigned int i, count=1; + int i, count=1; matches = malloc_array_p(char *, MAX_COMPLETIONS); if (!matches) return NULL; -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 4cf9923 Fix shadow variable name warning.
from 24ed8c5 regshell: Fix a counter that can actually be non-zero.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 4cf9923b09954a0605fb006e7d90d2fbff4d0a6b
Author: Jeremy Allison j...@samba.org
Date: Wed Feb 8 12:15:04 2012 -0800
Fix shadow variable name warning.
Autobuild-User: Jeremy Allison j...@samba.org
Autobuild-Date: Wed Feb 8 22:55:08 CET 2012 on sn-devel-104
---
Summary of changes:
lib/tdb2/transaction.c | 20 ++--
1 files changed, 10 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/tdb2/transaction.c b/lib/tdb2/transaction.c
index dd94510..dbdaf32 100644
--- a/lib/tdb2/transaction.c
+++ b/lib/tdb2/transaction.c
@@ -795,22 +795,22 @@ static struct tdb_recovery_record *alloc_recovery(struct
tdb_context *tdb,
offset += off;
while (off length) {
- tdb_len_t len;
+ tdb_len_t len1;
unsigned int samelen;
- len = different(tdb-tdb2.transaction-blocks[i] + off,
+ len1 = different(tdb-tdb2.transaction-blocks[i] + off,
buffer + off, length - off,
- sizeof(offset) + sizeof(len) + 1,
+ sizeof(offset) + sizeof(len1) + 1,
samelen);
memcpy(p, offset, sizeof(offset));
- memcpy(p + sizeof(offset), len, sizeof(len));
- tdb_convert(tdb, p, sizeof(offset) + sizeof(len));
- p += sizeof(offset) + sizeof(len);
- memcpy(p, buffer + off, len);
- p += len;
- off += len + samelen;
- offset += len + samelen;
+ memcpy(p + sizeof(offset), len1, sizeof(len1));
+ tdb_convert(tdb, p, sizeof(offset) + sizeof(len1));
+ p += sizeof(offset) + sizeof(len1);
+ memcpy(p, buffer + off, len1);
+ p += len1;
+ off += len1 + samelen;
+ offset += len1 + samelen;
}
tdb_access_release(tdb, buffer);
}
--
Samba Shared Repository
[SCM] Samba Website Repository - branch master updated
The branch, master has been updated via 71f8606 Remove 3smil as the web page is dead + no answer via 7c3b046 Update phone number of novso from 2e6773c Announce Samba 3.6.3. http://gitweb.samba.org/?p=samba-web.git;a=shortlog;h=master - Log - commit 71f860685b0e2a63ef3ec9576bf6ad90383867eb Author: Lars Müller l...@samba.org Date: Wed Feb 8 23:44:45 2012 +0100 Remove 3smil as the web page is dead + no answer commit 7c3b0468099084fee7453c8185432ccce5c3ee0e Author: Lars Müller l...@samba.org Date: Wed Feb 8 23:43:32 2012 +0100 Update phone number of novso --- Summary of changes: support/france.html |2 +- support/germany.html | 27 --- 2 files changed, 1 insertions(+), 28 deletions(-) Changeset truncated at 500 lines: diff --git a/support/france.html b/support/france.html index 33ddb6d..2079e04 100644 --- a/support/france.html +++ b/support/france.html @@ -39,7 +39,7 @@ Novso France a href=http://www.novso.com;http://www.novso.com/a -Tel: 01 79 97 19 50 +Tel: +33 1 83 64 22 70 a href=mailto:i...@novso.com;i...@novso.com/a Nicholas Deffayet diff --git a/support/germany.html b/support/germany.html index 4c2415f..255d014 100644 --- a/support/germany.html +++ b/support/germany.html @@ -4,33 +4,6 @@ !--#include virtual=header_support.html -- h2 align=centerCommercial Support - Germany/h2 -!-- Added JHT 20100809 -- -hr / -h33smil, Ltd./h3 -presmall -3smil, Ltd. -Muuml;hlenstr. 60 -50354 Hürth -NRW, Germany - -a href=http://3smil.com/;http://3smil.com//a -Tel: 02233-4053016 -a href=i...@3smil.comi...@3smil.com/a -Daniel Muuml;ller -/small/pre -p -3smil ist spezialisiert auf Open Source IT Dienstleistungen. Im Bereich Samba unterstuuml;tzen wir groÃe Netzwerke mit verteilten Architekturen. Unsere Kunden sind meisten Genossenschaften, Schulen, Verwaltungsbehörden, Kirchen oder ouml;ffentliche Einrichtungen. -/pp -Wir haben uns auf darauf spezialisiert, Windows Domaincontroller durch Samba und OpenLDAP abzulösen. Damit das reibungslos funktioniert, sind wir Ihnen von der Konzepterstellung uuml;ber die Durchfuuml;hrung bis hin zur späteren Pflege Ihres Netzwerks genau der richtige Ansprechpartner. -/pp -Da uns die Kundennauml;he sehr wichtig ist, bieten wir unseren Service im Raum Kouml;ln/Bonn an. -/pp -Unser Abrechnungssystem ist modular aufgebaut, so dass Sie nur Zahlen was Sie wirklich in Anspruch nehmen. -/pp -Spezializiertes: Migration von Windows zu Samba + OpenLDAP, Pflege und Wartung von Samba + OpenLDAP Netzwerken, verteilte Architekturen und Datensicherheit. -/p - - !-- Added JHT 20100427 -- hr / h3itsystems Deutschland AG/h3 -- Samba Website Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 4328f3c smbwrapper: Remove smbwrapper via b93326b s3-build: remove EXEEXT from Makefiles via fa1c713 s4:join python code - perform a fallback password set operation over libnet via 36e5526 s4:join python code - write the SAM account name correctly from 4cf9923 Fix shadow variable name warning. http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 4328f3ccf37d9a1baadbc55f658902e3b16ff125 Author: Andrew Bartlett abart...@samba.org Date: Fri Feb 3 15:06:48 2012 +1100 smbwrapper: Remove smbwrapper There are now many better ways to access a remote SMB filesystem, which do not rely on LD_PRELOAD and the associated dangers. FUSE, gvfs and the CIFS VFS are all much better options which do not require knowing every possible libc entry point that can deal with a file descriptor. As an example of the maintainence that would be required to keep this going, recent changes to deal with thread races and close-on-exec have resulted in dup3(), but this isn't currently mapped. While this would not be hard to add, it illistrates why it is better to move to an interface designed for this task. Andrew Bartlett Autobuild-User: Andrew Bartlett abart...@samba.org Autobuild-Date: Thu Feb 9 01:58:24 CET 2012 on sn-devel-104 commit b93326b9689d0ad935eed35f7cf5201ad04ac1ff Author: Andrew Bartlett abart...@samba.org Date: Thu Jan 26 09:23:23 2012 +1100 s3-build: remove EXEEXT from Makefiles As far as I am aware, we do not actually build on any platforms that require this. The last Stratos VOS release on ftp://ftp.stratus.com/vos/samba/samba.html was 3.0.5 Andrew Bartlett commit fa1c71382d4f89d9f6c45287a20b1817e08d098d Author: Matthias Dieter Wallnöfer m...@samba.org Date: Mon Nov 14 17:53:39 2011 +0100 s4:join python code - perform a fallback password set operation over libnet Windows 2000 DCs allow LDAP password set operations only with the help of SSL. Given the fact that this technique is hard to setup it is easier to use SAMR over libnet. Reviewed-By: Andrew Bartlett abart...@samba.org commit 36e5526685b92cea6e5a1b389737574213cd98ab Author: Matthias Dieter Wallnöfer m...@samba.org Date: Sun Jan 8 16:41:54 2012 +0100 s4:join python code - write the SAM account name correctly It is easier for the comprehension Reviewed-By: Andrew Bartlett abart...@samba.org --- Summary of changes: docs-xml/scripts/find_missing_manpages.pl|1 - docs-xml/using_samba/appd.xml|8 - docs-xml/using_samba/ch01.xml| 11 - docs-xml/using_samba/ch02.xml|8 - examples/VFS/configure.in|3 - examples/libsmbclient/smbwrapper/Makefile| 39 - examples/libsmbclient/smbwrapper/README | 40 - examples/libsmbclient/smbwrapper/bsd-strlcat.c | 71 - examples/libsmbclient/smbwrapper/bsd-strlcpy.c | 67 - examples/libsmbclient/smbwrapper/bsd-strlfunc.h |7 - examples/libsmbclient/smbwrapper/opendir_smbsh.c | 47 - examples/libsmbclient/smbwrapper/select.c| 122 -- examples/libsmbclient/smbwrapper/smbsh.1 | 203 --- examples/libsmbclient/smbwrapper/smbsh.1.html| 108 -- examples/libsmbclient/smbwrapper/smbsh.1.xml | 164 -- examples/libsmbclient/smbwrapper/smbsh.c | 162 -- examples/libsmbclient/smbwrapper/smbw.c | 932 examples/libsmbclient/smbwrapper/smbw.h | 166 --- examples/libsmbclient/smbwrapper/smbw_dir.c | 355 - examples/libsmbclient/smbwrapper/smbw_stat.c | 100 -- examples/libsmbclient/smbwrapper/wrapper.c | 1727 -- examples/libsmbclient/smbwrapper/wrapper.h | 212 --- packaging/SGI/idb.pl |5 - source3/Makefile.in | 187 ++-- source3/configure.in | 25 +- source3/lib/netapi/examples/Makefile.in | 208 ++-- source3/lib/netapi/tests/Makefile.in |4 +- source3/m4/swat.m4 |2 +- source4/scripting/python/samba/join.py | 26 +- 29 files changed, 231 insertions(+), 4779 deletions(-) delete mode 100644 examples/libsmbclient/smbwrapper/Makefile delete mode 100644 examples/libsmbclient/smbwrapper/README delete mode 100644 examples/libsmbclient/smbwrapper/bsd-strlcat.c delete mode 100644 examples/libsmbclient/smbwrapper/bsd-strlcpy.c delete mode 100644 examples/libsmbclient/smbwrapper/bsd-strlfunc.h delete mode 100644 examples/libsmbclient/smbwrapper/opendir_smbsh.c delete mode 100644 examples/libsmbclient/smbwrapper/select.c delete
