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> -<citerefentry><refentrytitle>smbmount</refentrytitle><manvolnum>8</manvolnum></citerefentry>, -<citerefentry><refentrytitle>smbumount</refentrytitle><manvolnum>8</manvolnum></citerefentry>, -<citerefentry><refentrytitle>smbmnt</refentrytitle><manvolnum>8</manvolnum></citerefentry></term> - <listitem><para><command>smbmount</command>,<command>smbumount</command> and <command>smbmnt</command> are commands that can be used to - mount CIFS/SMB shares on Linux. - </para></listitem> - </varlistentry> - - <varlistentry> <term><citerefentry><refentrytitle>smbcquotas</refentrytitle> <manvolnum>1</manvolnum></citerefentry></term> <listitem><para><command>smbcquotas</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 --- a/docs-xml/using_samba/ch02.xml +++ b/docs-xml/using_samba/ch02.xml @@ -269,12 +269,6 @@ docs/textdocs/UNIX_INSTALL.txt</programlisting> </varlistentry> -<varlistentry><term><literal>--with-smbmount</literal></term> -<listitem><para>Include <emphasis>smbmount</emphasis> -<indexterm id="ch02-idx-947366-0"><primary>smbmount, support for</primary></indexterm> support, which is for <indexterm id="ch02-idx-947367-0"><primary>Linux</primary><secondary>submount and</secondary></indexterm>Linux only. This feature wasn't being maintained at the time the book was written, so the Samba team made it an optional feature and provided <emphasis>smbwrapper</emphasis> instead. The <emphasis>smbwrapper</emphasis> feature works on more Unix platforms than <emphasis>smbmount</emphasis>, so you'll usually want to use <literal>--with-smbwrapper</literal> instead of this option.</para></listitem> -</varlistentry> - - <varlistentry><term><literal>--with-pam</literal></term> <listitem><para>Include support for <indexterm id="ch02-idx-947368-0"><primary>pluggable authentication modules (PAM)</primary><secondary>support for</secondary></indexterm> <indexterm id="ch02-idx-947368-1"><primary>PAM (pluggable authentication modules)</primary><secondary>support for</secondary></indexterm>pluggable authentication modules (PAM), an authentication feature common in the Linux operating system.</para></listitem> diff --git a/packaging/SGI/mkman b/packaging/SGI/mkman index a39ed9f..dfb6fb9 100755 --- a/packaging/SGI/mkman +++ b/packaging/SGI/mkman @@ -9,9 +9,6 @@ FILES="*.?" cd ../../docs/manpages for FILE in $FILES ; do - if [ "$FILE" = "smbmnt.8" ]; then continue; fi; - if [ "$FILE" = "smbmount.8" -o "$FILE" = "smbumount.8" ]; then continue; fi; - if [ "$FILE" = "smbrun.1" ]; then continue; fi; neqn $FILE | tbl | nroff -man > ../../packaging/SGI/catman/`basename $FILE` pack -f ../../packaging/SGI/catman/`basename $FILE` done diff --git a/source3/Makefile.in b/source3/Makefile.in index fc1067f..a14c2e8 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -566,7 +566,7 @@ LIBSMB_OBJ0 = \ ../auth/gensec/spnego.o \ ../auth/credentials/credentials.o \ ../auth/credentials/credentials_samba3.o \ - ../auth/ntlmssp/ntlmssp.o \ + ../auth/ntlmssp/ntlmssp_util.o \ ../auth/ntlmssp/ntlmssp_sign.o \ ../auth/ntlmssp/gensec_ntlmssp.o \ $(LIBNDR_NTLMSSP_OBJ) \ diff --git a/source3/VERSION b/source3/VERSION deleted file mode 100644 index fcab12a..0000000 --- a/source3/VERSION +++ /dev/null @@ -1,105 +0,0 @@ -######################################################## -# SAMBA Version # -# # -# Samba versions are as follows # -# 3.0.x New production series # -# 3.0.x{pre,rc}y Preview/Testing & RC # -# 3.0.x[a-z] Patch releases # -# 3.0.x[a-z]-VENDOR-z Vendor patch releases # -# # -# script/mkversion.sh # -# will use this file to create # -# include/version.h # -# # -######################################################## - -######################################################## -# This are the main SAMBA version numbers # -# # -# <MAJOR>.<MINOR>.<RELEASE> # -# # -# e.g. SAMBA_VERSION_MAJOR=3 # -# SAMBA_VERSION_MINOR=0 # -# SAMBA_VERSION_RELEASE=0 # -# -> "3.0.0" # -######################################################## -SAMBA_VERSION_MAJOR=3 -SAMBA_VERSION_MINOR=6 -SAMBA_VERSION_RELEASE=0 - -######################################################## -# Bug fix releases use a letter for the patch revision # -# # -# so SAMBA's version will be # -# <MAJOR>.<MINOR>.<RELEASE><REVISION> # -# # -# e.g. SAMBA_VERSION_REVISION=a # -# -> "2.2.8a" # -######################################################## -SAMBA_VERSION_REVISION= - -######################################################## -# For 'pre' releases the version will be # -# # -# <MAJOR>.<MINOR>.<RELEASE>pre<PRE_RELEASE> # -# # -# e.g. SAMBA_VERSION_PRE_RELEASE=1 # -# -> "2.2.9pre1" # -######################################################## -SAMBA_VERSION_PRE_RELEASE= - -######################################################## -# For 'rc' releases the version will be # -# # -# <MAJOR>.<MINOR>.<RELEASE>rc<RC_RELEASE> # -# # -# e.g. SAMBA_VERSION_RC_RELEASE=1 # -# -> "3.0.0rc1" # -######################################################## -SAMBA_VERSION_RC_RELEASE= - -######################################################## -# To mark SVN snapshots this should be set to 'yes' # -# in the development BRANCH, and set to 'no' only in # -# the SAMBA_X_X_RELEASE BRANCH # -# # -# <MAJOR>.<MINOR>.<RELEASE>[...]cvs # -# # -# e.g. SAMBA_VERSION_IS_SVN_SNAPSHOT=yes # -# -> "3.0.0-SVN-build-199" # -######################################################## -SAMBA_VERSION_IS_GIT_SNAPSHOT=yes - -######################################################## -# This can be set by vendors if they want... # -# # -# <MAJOR>.<MINOR>.<RELEASE>[...]-<VENDOR_SUFFIX> # -# # -# Note the '-' is automatically added # -# # -# e.g. SAMBA_VERSION_VENDOR_SUFFIX="VendorVersion" # -# -> "CVS 3.0.0rc2-VendorVersion" # -# # -# Note: If you want to use a function, take a look at # -# SAMBA_VERSION_VENDOR_FUNCTION # -# # -######################################################## -SAMBA_VERSION_VENDOR_SUFFIX="devel" -SAMBA_VERSION_VENDOR_PATCH= - -######################################################## -# This can be set by vendors if they want.. # -# This have to be a function which returns a string # -# (const char *). # -# # -# Patch for example lib/version.c and add something # -# like the following example: # -# # -# const char *samba_vendor_version(void) # -# { # -# return SAMBA_VERSION_OFFICIAL_STRING "-ENREDO-1.0" # -# } # -# # -# -> "Version 3.2.0-ENREDO-1.0 # -######################################################## -SAMBA_VERSION_VENDOR_FUNCTION= diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c index 4c9ebc0..e066578 100644 --- a/source3/auth/auth_util.c +++ b/source3/auth/auth_util.c @@ -92,8 +92,8 @@ NTSTATUS make_user_info_map(struct auth_usersupplied_info **user_info, const char *client_domain, const char *workstation_name, const struct tsocket_address *remote_address, - DATA_BLOB *lm_pwd, - DATA_BLOB *nt_pwd, + const DATA_BLOB *lm_pwd, + const DATA_BLOB *nt_pwd, const struct samr_Password *lm_interactive_pwd, const struct samr_Password *nt_interactive_pwd, const char *plaintext, diff --git a/source3/auth/proto.h b/source3/auth/proto.h index 77f0f54..82d6018 100644 --- a/source3/auth/proto.h +++ b/source3/auth/proto.h @@ -100,8 +100,8 @@ NTSTATUS make_user_info_map(struct auth_usersupplied_info **user_info, const char *client_domain, const char *workstation_name, const struct tsocket_address *remote_address, - DATA_BLOB *lm_pwd, - DATA_BLOB *nt_pwd, + const DATA_BLOB *lm_pwd, + const DATA_BLOB *nt_pwd, const struct samr_Password *lm_interactive_pwd, const struct samr_Password *nt_interactive_pwd, const char *plaintext, diff --git a/source3/passdb/pdb_samba4.c b/source3/passdb/pdb_samba4.c index 9db9a9b..2b785fa 100644 --- a/source3/passdb/pdb_samba4.c +++ b/source3/passdb/pdb_samba4.c @@ -2198,7 +2198,6 @@ static void free_private_data(void **vp) static NTSTATUS pdb_samba4_init_secrets(struct pdb_methods *m) { -#if _SAMBA_BUILD_ == 4 struct pdb_domain_info *dom_info; bool ret; @@ -2228,7 +2227,6 @@ done: if (!ret) { return NT_STATUS_UNSUCCESSFUL; } -#endif return NT_STATUS_OK; } diff --git a/source3/po/ru/help/welcome.html b/source3/po/ru/help/welcome.html index 636d96f..0e4b2c1 100644 --- a/source3/po/ru/help/welcome.html +++ b/source3/po/ru/help/welcome.html @@ -34,9 +34,6 @@ samba-3.0.25a-2 <li><a href="/swat/help/manpages/rpcclient.1.html" target="docs">rpcclient</a> - клиент MS-RPC с интерфейсом командной строки <li><a href="/swat/help/manpages/smbtar.1.html" target="docs">smbtar</a> - инструмент резервного копирования SMB <li><a href="/swat/help/manpages/smbclient.1.html" target="docs">smbclient</a> - клиент SMB с интерфейсом командной строки - <li><a href="/swat/help/manpages/smbmnt.8.html" target="docs">smbmnt</a> - вспомогательная утилита для монтирования файловых систем SMB на машинах Linux - <li><a href="/swat/help/manpages/smbmount.8.html" target="docs">smbmount</a> - пользовательский инструмент для монтирования файловых систем SMB под Linux - <li><a href="/swat/help/manpages/smbumount.8.html" target="docs">smbumount</a> - пользовательский инструмент для размонтирования файловых систем SMB под Linux <li><a href="/swat/help/manpages/ntlm_auth.1.html" target="docs">ntlm_auth</a> - позволяет внешним программам использовать аутентификацию NTLM <li><a href="/swat/help/manpages/smbcquotas.1.html" target="docs">smbcquotas</a> - запрашивает или устанавливает квоты ресурсов на NTFS 5 <li><a href="/swat/help/manpages/smbspool.8.html" target="docs">smbspool</a> - отправляет задание на печать через SMB-принтер diff --git a/source3/script/mkversion.sh b/source3/script/mkversion.sh index 5ad197d..0e4a860 100755 --- a/source3/script/mkversion.sh +++ b/source3/script/mkversion.sh @@ -4,7 +4,7 @@ VERSION_FILE=$1 OUTPUT_FILE=$2 if test -z "$VERSION_FILE";then - VERSION_FILE="VERSION" + VERSION_FILE="../VERSION" fi if test -z "$OUTPUT_FILE";then diff --git a/source4/lib/messaging/pymessaging.c b/source4/lib/messaging/pymessaging.c index d9ad379..e8ef4a8 100644 --- a/source4/lib/messaging/pymessaging.c +++ b/source4/lib/messaging/pymessaging.c @@ -250,9 +250,8 @@ PyTypeObject imessaging_Type = { .tp_dealloc = py_imessaging_dealloc, .tp_methods = py_imessaging_methods, .tp_getset = py_imessaging_getset, - .tp_doc = "Messaging(own_id=None, imessaging_path=None)\n" \ - "Create a new object that can be used to communicate with the peers in the specified messaging path.\n" \ - "If no path is specified, the default path from smb.conf will be used." + .tp_doc = "Messaging(own_id=None)\n" \ + "Create a new object that can be used to communicate with the peers in the specified messaging path.\n" }; void initmessaging(void) diff --git a/swat/help/welcome.html b/swat/help/welcome.html index bf04580..5f73793 100644 --- a/swat/help/welcome.html +++ b/swat/help/welcome.html @@ -31,9 +31,6 @@ Please choose a configuration action using one of the above buttons <li><a href="/swat/help/manpages/rpcclient.1.html" target="docs">rpcclient</a> - command line MS-RPC client <li><a href="/swat/help/manpages/smbtar.1.html" target="docs">smbtar</a> - SMB backup tool <li><a href="/swat/help/manpages/smbclient.1.html" target="docs">smbclient</a> - command line SMB client - <li><a href="/swat/help/manpages/smbmnt.8.html" target="docs">smbmnt</a> - helper utility for mounting SMB filesystems on Linux hosts - <li><a href="/swat/help/manpages/smbmount.8.html" target="docs">smbmount</a> - user space tool for mounting SMB filesystems under Linux - <li><a href="/swat/help/manpages/smbumount.8.html" target="docs">smbumount</a> - user space tool for umounting SMB filesystems under Linux <li><a href="/swat/help/manpages/ntlm_auth.1.html" target="docs">ntlm_auth</a> - allow external programs to use NTLM authentication <li><a href="/swat/help/manpages/smbcquotas.1.html" target="docs">smbcquotas</a> - get or set quotas on NTFS 5 shares <li><a href="/swat/help/manpages/smbspool.8.html" target="docs">smbspool</a> - Send a print job to an SMB printer diff --git a/swat/lang/ja/help/welcome.html b/swat/lang/ja/help/welcome.html index bcae8e9..01d3f78 100644 --- a/swat/lang/ja/help/welcome.html +++ b/swat/lang/ja/help/welcome.html @@ -31,10 +31,7 @@ <li><a href="/swat/help/rpcclient.1.html" target="docs">rpcclient</a> - コマンドラインの MS-RPC クライアント <li><a href="/swat/help/smbtar.1.html" target="docs">smbtar</a> - SMB バックアップツール <li><a href="/swat/help/smbclient.1.html" target="docs">smbclient</a> - コマンドラインの SMB クライアント - <li><a href="/swat/help/smbmnt.8.html" target="docs">smbmnt</a> - Linux 上の SMB ファイルシステムをマウントする際の補助ツール - <li><a href="/swat/help/smbmount.8.html" target="docs">smbmount</a> - Linux における SMB ファイルシステムのマウントを実現するユーザ空間のツール <li><a href="/swat/help/smbspool.8.html" target="docs">smbspool</a> - コマンドラインの SMB 印刷クライアント - <li><a href="/swat/help/smbumount.8.html" target="docs">smbumount</a> - Linux における SMB ファイルシステムのアンマウントを実現するユーザ空間のツール <li><a href="/swat/help/ntlm_auth.1.html" target="docs">ntlm_auth</a> - 別プログラムからの NTLM 認証の使用を実現 <li><a href="/swat/help/smbcquotas.1.html" target="docs">smbcquotas</a> - NTFS 5 共有のクォータ情報の設定と取得 <li><a href="/swat/help/smbsh.1.html" target="docs">smbsh</a> - UNIX シェルを用いたリモート SMB 共有へのアクセスを実現 diff --git a/swat/lang/tr/help/welcome.html b/swat/lang/tr/help/welcome.html index 2dc4c09..bc0d584 100644 --- a/swat/lang/tr/help/welcome.html +++ b/swat/lang/tr/help/welcome.html @@ -31,10 +31,7 @@ Yukarıdaki düğmelerden birini kullanarak bir ayar eylemi seçin. <li><a href="/swat/help/rpcclient.1.html" target="docs">rpcclient</a> - komut satırı MS-RPC istemcisi <li><a href="/swat/help/smbtar.1.html" target="docs">smbtar</a> - SMB yedekleme aracı <li><a href="/swat/help/smbclient.1.html" target="docs">smbclient</a> - komut satırı SMB istemcisi - <li><a href="/swat/help/smbmnt.8.html" target="docs">smbmnt</a> - Linux makinalarına SMB dosya sistemlerini bağlamak için yardımcı araç - <li><a href="/swat/help/smbmount.8.html" target="docs">smbmount</a> - Linux altında SMB dosya sistemlerini bağlamak için kullanıcı aracı <li><a href="/swat/help/smbspool.8.html" target="docs">smbspool</a> - komut satırı SMB yazıcı istemcisi - <li><a href="/swat/help/smbumount.8.html" target="docs">smbumount</a> - Linux altında SMB dosya sistemlerini çözmek için kullanıcı aracı </ul> <li><b>Teşhis Araçları</b> <ul> -- Samba Shared Repository