[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Wed Feb 23 15:46:02 MST 2011
The branch, master has been updated
via 29f850a s3-docs: document all wbinfo options.
via 6b587d7 s3-waf: start adding checks for quota support.
via 6c2c8d9 s3-waf: remove more unused variables.
via 7f55354 s3-waf: rename LIBSAMBA subsystem to LIBNTLMSSP (which it is in fact).
via bf7f896 s3-waf: move GROUPDB into libpassdb.so.
from 63af546 Fix broken build with make dist tarballs
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 29f850ac4330909afa426474686be363d0249d73
Author: Günther Deschner <gd at samba.org>
Date: Wed Feb 23 15:48:23 2011 +0100
s3-docs: document all wbinfo options.
Guenther
Autobuild-User: Günther Deschner <gd at samba.org>
Autobuild-Date: Wed Feb 23 23:45:40 CET 2011 on sn-devel-104
commit 6b587d74d906638bc3a279a2ed039081a6b0b958
Author: Günther Deschner <gd at samba.org>
Date: Wed Feb 23 12:29:24 2011 +0100
s3-waf: start adding checks for quota support.
Guenther
commit 6c2c8d9f67d628d7bf007ad9a13d6f61414e38da
Author: Günther Deschner <gd at samba.org>
Date: Wed Feb 23 17:00:39 2011 +0100
s3-waf: remove more unused variables.
Guenther
commit 7f5535460af57b0440bc2bde8c42ee7d1ac844e5
Author: Günther Deschner <gd at samba.org>
Date: Wed Feb 23 16:50:57 2011 +0100
s3-waf: rename LIBSAMBA subsystem to LIBNTLMSSP (which it is in fact).
Guenther
commit bf7f896d5599ec79d50239c858b7df5478c74062
Author: Günther Deschner <gd at samba.org>
Date: Wed Feb 23 16:19:48 2011 +0100
s3-waf: move GROUPDB into libpassdb.so.
Guenther
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages-3/wbinfo.1.xml | 101 +++++++++++++++++++++++++++++++++++-
source3/pam_smbpass/wscript_build | 4 +-
source3/wscript | 8 +++
source3/wscript_build | 52 ++++++++-----------
4 files changed, 129 insertions(+), 36 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages-3/wbinfo.1.xml b/docs-xml/manpages-3/wbinfo.1.xml
index 0f9f206..c1b2c1f 100644
--- a/docs-xml/manpages-3/wbinfo.1.xml
+++ b/docs-xml/manpages-3/wbinfo.1.xml
@@ -24,36 +24,49 @@
<arg choice="opt">--allocate-gid</arg>
<arg choice="opt">--allocate-uid</arg>
<arg choice="opt">-c</arg>
+ <arg choide="opt">--ccache-save</arg>
+ <arg choide="opt">--change-user-password</arg>
<arg choice="opt">-D domain</arg>
<arg choice="opt">--domain domain</arg>
+ <arg choide="opt">--dsgetdcname domain</arg>
<arg choice="opt">-g</arg>
<arg choice="opt">--getdcname domain</arg>
<arg choice="opt">--get-auth-user</arg>
<arg choice="opt">-G gid</arg>
- <arg choice="opt">-h</arg>
+ <arg choide="opt">--gid-info</arg>
+ <arg choide="opt">--group-info</arg>
+ <arg choice="opt">--help|-?</arg>
<arg choice="opt">-i user</arg>
<arg choice="opt">-I ip</arg>
<arg choice="opt">-K user%password</arg>
+ <arg choide="opt">--lanman</arg>
<arg choice="opt">-m</arg>
<arg choice="opt">-n name</arg>
<arg choice="opt">-N netbios-name</arg>
+ <arg choide="opt">--ntlmv2</arg>
+ <arg choide="opt">--online-status</arg>
<arg choice="opt">--own-domain</arg>
<arg choice="opt">-p</arg>
- <arg choice="opt">-P</arg>
+ <arg choice="opt">-P|--ping-dc</arg>
<arg choice="opt">-r user</arg>
+ <arg choide="opt">-R|--lookup-rids</arg>
<arg choice="opt">-s sid</arg>
<arg choice="opt">--separator</arg>
<arg choice="opt">--set-auth-user user%password</arg>
<arg choice="opt">-S sid</arg>
+ <arg choide="opt">--sid-aliases</arg>
+ <arg choide="opt">--sid-to-fullname</arg>
<arg choice="opt">-t</arg>
<arg choice="opt">-u</arg>
<arg choice="opt">--uid-info uid</arg>
+ <arg choide="opt">--usage</arg>
<arg choice="opt">--user-domgroups sid</arg>
<arg choice="opt">--user-sids sid</arg>
<arg choice="opt">-U uid</arg>
<arg choice="opt">-V</arg>
- <arg choice="opt">-Y sid</arg>
<arg choice="opt">--verbose</arg>
+ <arg choice="opt">-Y sid</arg>
+
</cmdsynopsis>
</refsynopsisdiv>
@@ -116,6 +129,18 @@
</varlistentry>
<varlistentry>
+ <term>--ccache-save <replaceable>username%password</replaceable></term>
+ <listitem><para>Store user and password for ccache.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--change-user-password <replaceable>username</replaceable></term>
+ <listitem><para>Change the password of a user. The old and new password will be prompted.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>--domain <replaceable>name</replaceable></term>
<listitem><para>This parameter sets the domain on which any specified
operations will performed. If special domain name '.' is used to represent
@@ -133,6 +158,24 @@
</varlistentry>
<varlistentry>
+ <term>--dsgetdcname <replaceable>domain</replaceable></term>
+ <listitem><para>Find a DC for a domain.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--gid-info <replaceable>gid</replaceable></term>
+ <listitem><para>Get group info from gid.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--group-info <replaceable>user</replaceable></term>
+ <listitem><para>Get group info for user.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>-g|--domain-groups</term>
<listitem><para>This option will list all groups available
in the Windows NT domain for which the <citerefentry><refentrytitle>samba</refentrytitle>
@@ -166,6 +209,12 @@
</varlistentry>
<varlistentry>
+ <term>-?</term>
+ <listitem><para>Print brief help overview.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>-i|--user-info <replaceable>user</replaceable></term>
<listitem><para>Get user info.
</para></listitem>
@@ -188,6 +237,12 @@
</varlistentry>
<varlistentry>
+ <term>--lanman</term>
+ <listitem><para>Use lanman cryptography for user authentication.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>-m|--trusted-domains</term>
<listitem><para>Produce a list of domains trusted by the
Windows NT server <citerefentry><refentrytitle>winbindd</refentrytitle>
@@ -222,6 +277,20 @@
</varlistentry>
<varlistentry>
+ <term>--ntlmv2</term>
+ <listitem><para>Use NTLMv2 cryptography for user authentication.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--online-status <replaceable>domain</replaceable></term>
+ <listitem><para>Show whether domains are marked as online or
+ offline. An optional domain argument limits the
+ output to the online status of a given domain.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>--own-domain</term>
<listitem><para>List own domain.
</para></listitem>
@@ -253,6 +322,13 @@
</varlistentry>
<varlistentry>
+ <term>-R|--lookup-rids <replaceable>rid1, rid2, rid3...</replaceable></term>
+ <listitem><para>Converts RIDs to names. Uses a comma separated
+ list of rids.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>-s|--sid-to-name <replaceable>sid</replaceable></term>
<listitem><para>Use <parameter>-s</parameter> to resolve
a SID to a name. This is the inverse of the <parameter>-n
@@ -287,6 +363,19 @@
</varlistentry>
<varlistentry>
+ <term>--sid-aliases <replaceable>sid</replaceable></term>
+ <listitem><para>Get SID aliases for a given SID.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--sid-to-fullname <replaceable>sid</replaceable></term>
+ <listitem><para>Converts a SID to a full username
+ (DOMAIN\username).
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>-t|--check-secret</term>
<listitem><para>Verify that the workstation trust account
created when the Samba server is added to the Windows NT
@@ -313,6 +402,12 @@
</varlistentry>
<varlistentry>
+ <term>--usage</term>
+ <listitem><para>Print brief help overview.
+ </para></listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>--user-domgroups <replaceable>sid</replaceable></term>
<listitem><para>Get user domain groups.
</para></listitem>
diff --git a/source3/pam_smbpass/wscript_build b/source3/pam_smbpass/wscript_build
index 0e07927..80aa0fb 100644
--- a/source3/pam_smbpass/wscript_build
+++ b/source3/pam_smbpass/wscript_build
@@ -6,8 +6,8 @@ if bld.CONFIG_SET('WITH_PAM_MODULES'):
pam_smb_passwd.c
pam_smb_acct.c
support.c''',
- deps='''tdb talloc pam PAM_ERRORS wbclient cap ASN1_UTIL param LIB_NONSMBD passdb GROUPDB SMBLDAP
- LIBSAMBA LIBTSOCKET''',
+ deps='''tdb talloc pam PAM_ERRORS wbclient cap ASN1_UTIL param LIB_NONSMBD passdb SMBLDAP
+ LIBNTLMSSP LIBTSOCKET''',
cflags='-DLOCALEDIR=\"%s/locale\"' % bld.env.DATADIR,
realname='pam_smbpass.so',
)
diff --git a/source3/wscript b/source3/wscript
index b77a46e..90a541b 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -1487,6 +1487,14 @@ main() {
conf.CHECK_FUNCS_IN('getspnam', 'security')
conf.CHECK_FUNCS_IN('getspnam', 'sec')
+ if Options.options.with_quotas:
+ # For quotas on Veritas VxFS filesystems
+ conf.CHECK_HEADERS('sys/fs/vx_quota.h')
+ # For quotas on Linux XFS filesystems
+ conf.CHECK_HEADERS('linux/dqblk_xfs.h')
+ # For sys/quota.h and linux/quota.h
+ conf.CHECK_HEADERS('sys/quota.h')
+
default_static_modules=TO_LIST('''pdb_smbpasswd pdb_tdbsam pdb_wbc_sam
auth_sam auth_unix auth_winbind auth_wbc auth_server
auth_domain auth_builtin vfs_default
diff --git a/source3/wscript_build b/source3/wscript_build
index c2c9deb..657a866 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -47,17 +47,9 @@ LIBCLI_WINREG_SRC = '''rpc_client/cli_winreg.c
# that requires knowledge of security contexts
REG_PARSE_PRS_SRC = '''registry/reg_parse_prs.c'''
-LIBREPLACE_SRC = '''${LIBREPLACE_SRCS}'''
-
-LIBSAMBAUTIL_SRC = '''${LIBREPLACE_SRC}'''
-
-LIBTEVENT_SRC0 = ''
-
PTHREADPOOL_SRC = ''
-LIBREPLACE_SRCS = ''
-
-LIB_SRC = '''${LIBSAMBAUTIL_SRC}
+LIB_SRC = '''
lib/messages.c lib/messages_local.c
lib/messages_ctdbd.c lib/packet.c lib/ctdbd_conn.c
lib/interfaces.c lib/memcache.c
@@ -86,7 +78,7 @@ LIB_SRC = '''${LIBSAMBAUTIL_SRC}
intl/lang_tdb.c
lib/conn_tdb.c lib/adt_tree.c lib/gencache.c
lib/sessionid_tdb.c
- lib/module.c lib/events.c ${LIBTEVENT_SRC0}
+ lib/module.c lib/events.c
lib/server_contexts.c
lib/ldap_escape.c
lib/secdesc.c ${PTHREADPOOL_SRC}
@@ -135,7 +127,7 @@ DCE_RPC_ERR_SRC = '../librpc/rpc/dcerpc_error.c'
LIBSMB_ERR_SRC = '''${DCE_RPC_ERR_SRC}'''
-LIBSMB_SRC0 = '''
+LIBNTLMSSP_SRC = '''
libsmb/ntlmssp.c
libsmb/ntlmssp_wrap.c
../libcli/auth/ntlmssp.c
@@ -143,8 +135,6 @@ LIBSMB_SRC0 = '''
../libcli/auth/ntlmssp_ndr.c
../libcli/auth/ntlmssp_server.c'''
-LIBSAMBA_SRC = '${LIBSMB_SRC0}'
-
TLDAP_SRC = '''lib/tldap.c lib/tldap_util.c lib/util_tsock.c'''
SCHANNEL_SRC = '''../libcli/auth/schannel_sign.c'''
@@ -666,7 +656,7 @@ if not bld.env.toplevel_build:
bld.SAMBA3_LIBRARY('netapi',
source=LIBNETAPI_SRC,
public_deps='''talloc tdb cap wbclient LIB_NONSMBD LIBSMB KRBCLIENT
- passdb SMBLDAP GROUPDB PARAM_WITHOUT_REG DYNCONFIG
+ passdb SMBLDAP PARAM_WITHOUT_REG DYNCONFIG
LIBMSRPC_GEN msrpc3 ads LIBNET DCUTIL NDR_LIBNETAPI
RPC_CLIENT_SCHANNEL LIB_SMBCONF REG_SMBCONF TOKEN_UTIL
LIBCLI_SAMR LIBCLI_LSA3 LIBRPCCLI_NETLOGON
@@ -678,7 +668,7 @@ bld.SAMBA3_LIBRARY('netapi',
bld.SAMBA3_LIBRARY('libsmb/smbclient',
source=LIBSMBCLIENT_SRC,
- public_deps='''talloc tdb wbclient cap param LIB_NONSMBD LIBSMB KRBCLIENT passdb SMBLDAP GROUPDB
+ public_deps='''talloc tdb wbclient cap param LIB_NONSMBD LIBSMB KRBCLIENT passdb SMBLDAP
LIBMSRPC_GEN msrpc3 LIBCLI_LSA3 RPC_NDR_SRVSVC''',
public_headers='include/libsmbclient.h',
vnum='0',
@@ -729,7 +719,7 @@ bld.SAMBA3_SUBSYSTEM('TLDAP',
bld.SAMBA3_LIBRARY('passdb',
source=PASSDB_SRC,
- deps='GROUPDB SECRETS3 SMBLDAP pdb wbclient',
+ deps='SECRETS3 SMBLDAP GROUPDB pdb wbclient',
private_library=True,
vars=locals())
@@ -776,7 +766,7 @@ bld.SAMBA3_SUBSYSTEM('POPT_SAMBA3',
bld.SAMBA3_SUBSYSTEM('KRBCLIENT',
source=KRBCLIENT_SRC,
- deps='krb5 k5crypto com_err gssapi gssapi_krb5',
+ public_deps='krb5 k5crypto com_err gssapi gssapi_krb5',
vars=locals())
bld.SAMBA3_LIBRARY('samba3core',
@@ -795,14 +785,14 @@ bld.SAMBA3_SUBSYSTEM('LIBSMB_ERR',
deps='errors3 SECRETS3 ldap lber MSRPC_PARSE LIBCLI_AUTH',
vars=locals())
-bld.SAMBA3_SUBSYSTEM('LIBSAMBA',
- source=LIBSAMBA_SRC,
+bld.SAMBA3_SUBSYSTEM('LIBNTLMSSP',
+ source=LIBNTLMSSP_SRC,
deps='LIBSMB_ERR NDR_NTLMSSP ntlm_check',
vars=locals())
bld.SAMBA3_SUBSYSTEM('LIBSMB',
source=LIBSMB_SRC,
- deps='LIBSAMBA CLDAP LIBNMB LIBNBT LIBDRSUAPI SPNEGO_PARSE LIBTSOCKET KRBCLIENT',
+ deps='LIBNTLMSSP CLDAP LIBNMB LIBNBT LIBDRSUAPI SPNEGO_PARSE LIBTSOCKET KRBCLIENT',
vars=locals())
bld.SAMBA3_SUBSYSTEM('LIBDRSUAPI',
@@ -1130,21 +1120,21 @@ bld.SAMBA3_BINARY('smbcontrol',
bld.SAMBA3_BINARY('smbtree',
source=SMBTREE_SRC,
deps='''talloc tdb tevent cap resolv wbclient param LIB_NONSMBD
- LIBSMB LIBSMB_ERR POPT_SAMBA3 KRBCLIENT passdb SMBLDAP GROUPDB LIBMSRPC_GEN msrpc3 PROFILE
+ LIBSMB LIBSMB_ERR POPT_SAMBA3 KRBCLIENT passdb SMBLDAP LIBMSRPC_GEN msrpc3 PROFILE
RPC_NDR_SRVSVC''',
vars=locals())
bld.SAMBA3_BINARY('smbpasswd',
source=SMBPASSWD_SRC,
deps='''talloc tdb tevent cap resolv wbclient param LIB_NONSMBD
- LIBSMB LIBSMB_ERR POPT_SAMBA3 KRBCLIENT passdb SMBLDAP GROUPDB LIBMSRPC_GEN msrpc3 PASSWD_UTIL
+ LIBSMB LIBSMB_ERR POPT_SAMBA3 KRBCLIENT passdb SMBLDAP LIBMSRPC_GEN msrpc3 PASSWD_UTIL
LIBCLI_SAMR INIT_LSA PASSCHANGE''',
vars=locals())
bld.SAMBA3_BINARY('pdbedit',
source=PDBEDIT_SRC,
deps='''talloc tdb tevent cap resolv wbclient param LIB_NONSMBD
- LIBSAMBA LIBSMB_ERR POPT_SAMBA3 passdb SMBLDAP GROUPDB
+ LIBNTLMSSP LIBSMB_ERR POPT_SAMBA3 passdb SMBLDAP
PASSWD_UTIL LIBCLI_LDAP_NDR''',
vars=locals())
@@ -1188,14 +1178,14 @@ bld.SAMBA3_BINARY('msgtest',
bld.SAMBA3_BINARY('smbcacls',
source=SMBCACLS_SRC,
deps='''talloc tdb cap resolv wbclient param LIBSMB KRBCLIENT
- LIB_NONSMBD passdb GROUPDB POPT_SAMBA3 SMBLDAP LIBMSRPC_GEN
+ LIB_NONSMBD passdb POPT_SAMBA3 SMBLDAP LIBMSRPC_GEN
msrpc3 LIBCLI_LSA3''',
vars=locals())
bld.SAMBA3_BINARY('smbcquotas',
source=SMBCQUOTAS_SRC,
deps='''talloc tdb cap resolv wbclient param LIB_NONSMBD LIBSMB KRBCLIENT
- POPT_SAMBA3 passdb SMBLDAP GROUPDB LIBMSRPC_GEN msrpc3
+ POPT_SAMBA3 passdb SMBLDAP LIBMSRPC_GEN msrpc3
LIBCLI_LSA3''',
vars=locals())
@@ -1218,7 +1208,7 @@ bld.SAMBA3_BINARY('locktest' + bld.env.suffix3,
bld.SAMBA3_BINARY('pdbtest',
source=PDBTEST_SRC,
- deps='''talloc tdb cap resolv wbclient param LIBSMB KRBCLIENT LIB_NONSMBD passdb GROUPDB
+ deps='''talloc tdb cap resolv wbclient param LIBSMB KRBCLIENT LIB_NONSMBD passdb
SMBLDAP POPT_SAMBA3 NDR_SAMR NDR_LSA''',
vars=locals())
@@ -1263,14 +1253,14 @@ bld.SAMBA3_BINARY('wbinfo' + bld.env.suffix3,
source=WBINFO_SRC,
deps='''talloc wbclient tevent cap
ASN1_UTIL LIBTSOCKET passdb ldap param LIB_NONSMBD
- LIBSAMBA POPT_SAMBA3 LIBAFS_SETTOKEN''',
+ LIBNTLMSSP POPT_SAMBA3 LIBAFS_SETTOKEN''',
vars=locals())
bld.SAMBA3_BINARY('ntlm_auth' + bld.env.suffix3,
source=NTLM_AUTH_SRC,
deps='''tdb talloc cap resolv krb5 k5crypto com_err wbclient param LIB_NONSMBD
- samba3core LIBSAMBA POPT_SAMBA3 ASN1_UTIL LIBTSOCKET
- passdb GROUPDB SMBLDAP winbind-client LIBINIPARSER LIBADS_SERVER
+ samba3core LIBNTLMSSP POPT_SAMBA3 ASN1_UTIL LIBTSOCKET
+ passdb SMBLDAP winbind-client LIBINIPARSER LIBADS_SERVER
NDR_SAMR NDR_LSA NDR_NETLOGON LIBCLI_LDAP_NDR LIBNMB SLCACHE SPNEGO_PARSE KRBCLIENT''',
vars=locals())
@@ -1286,7 +1276,7 @@ bld.SAMBA3_BINARY('rpc_open_tcp',
bld.SAMBA3_BINARY('test_lp_load',
source=TEST_LP_LOAD_SRC,
- deps='''talloc tdb tevent cap wbclient param LIB_NONSMBD POPT_SAMBA3 LIBSAMBA''',
+ deps='''talloc tdb tevent cap wbclient param LIB_NONSMBD POPT_SAMBA3 LIBNTLMSSP''',
vars=locals())
bld.SAMBA3_BINARY('dbwrap_tool',
@@ -1303,7 +1293,7 @@ bld.SAMBA3_BINARY('dbwrap_torture',
bld.SAMBA3_BINARY('split_tokens',
source=SPLIT_TOKENS_SRC,
deps='''talloc tdb tevent cap wbclient param LIB_NONSMBD POPT_SAMBA3
- LIBSAMBA''',
+ LIBNTLMSSP''',
vars=locals())
bld.SAMBA3_BINARY('vlp',
--
Samba Shared Repository
More information about the samba-cvs
mailing list