[SCM] Samba Shared Repository - branch v3-6-test updated

Günther Deschner gd at samba.org
Wed Feb 23 16:01:58 MST 2011


The branch, v3-6-test has been updated
       via  eab0755 s3-docs: document all wbinfo options.
       via  92bba5e s3-proto: remove some prototypes of non-existing functions.
       via  304d7ec s3-waf: add check for getspnam().
       via  d837ba8 s3-waf: add check for TDB_ERR_NESTING.
       via  08beb48 s3-waf: add check for sendfile on AIX.
       via  67476cb s3-waf: add check for sendfile on solaris.
       via  d5e12c7 s3-waf: add check for sendfile on hpux.
       via  52e1b95 s3-waf: add check for sendfile on freebsd.
       via  ec926be s3-waf: add check for sendfile on linux.
       via  a9c8601 s3-waf: make sure ENABLE_BUILD_FARM_HACKS is enabled when run on the buildfarm.
       via  5baca4d s3-includes: move some chgpasswd related defines to the locations where they are used.
       via  d0f402c s3-waf: add check for ftruncate extend.
       via  bc9f805 s3-waf: add check for realpath() NULL arg.
       via  794bda5 s3-waf: add check for makedev().
       via  7e44d0f s3-waf: add check for TIME_T_MAX.
       via  328b8b3 s3-waf: add check for /proc/sys/kernel/core_pattern.
       via  6f30626 s4-smbtorture: use torture_comment() instead of printf in raw.write test.
       via  360c39d s4-smbtorture: fix some indent in raw.write test.
       via  d876fa4 s4-smbtorture: fix trailing whitespace in raw.write test.
       via  5ddb084 s3-smbsharemodes: libsmbsharemodes does neither depend on krb5 or ldap.
       via  6a2d9f4 nsswitch: make libwbclient a public library again.
      from  18e048e s3:libsmb only log a dead connection if it was not closed

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit eab07557cfa0badfb94ca99419090f7cc50ac31f
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
    (cherry picked from commit 29f850ac4330909afa426474686be363d0249d73)

commit 92bba5eb35abcbad58e52fcb9b72cb926c7516be
Author: Günther Deschner <gd at samba.org>
Date:   Wed Feb 23 13:29:00 2011 +0100

    s3-proto: remove some prototypes of non-existing functions.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Wed Feb 23 15:42:35 CET 2011 on sn-devel-104
    (cherry picked from commit ab64634a2070042d96da7aadc7fff2ea97199c0e)

commit 304d7ece570ccf786a061dd4819bda05fc2b98a0
Author: Günther Deschner <gd at samba.org>
Date:   Tue Feb 22 22:56:23 2011 +0100

    s3-waf: add check for getspnam().
    
    Guenther
    (cherry picked from commit 8bca9df258527125e6b7ec9b9ad060cc0fdc3ddf)

commit d837ba84c5eb8858dc03ca41920547d5afc3f759
Author: Günther Deschner <gd at samba.org>
Date:   Tue Feb 22 22:34:05 2011 +0100

    s3-waf: add check for TDB_ERR_NESTING.
    
    Guenther
    (cherry picked from commit b1e5dc716e1d968edf7e2686ba1dda3a42381541)

commit 08beb48b8a9a86c58dbe16aafe22af179e48e7ca
Author: Günther Deschner <gd at samba.org>
Date:   Tue Feb 22 21:36:35 2011 +0100

    s3-waf: add check for sendfile on AIX.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Tue Feb 22 22:36:53 CET 2011 on sn-devel-104
    (cherry picked from commit 7f0ef4fb4ad430190d143b0ed73fb3a68dde17fd)

commit 67476cb3d8275e02399aa6e100753152fd153612
Author: Günther Deschner <gd at samba.org>
Date:   Tue Feb 22 21:33:06 2011 +0100

    s3-waf: add check for sendfile on solaris.
    
    Guenther
    (cherry picked from commit 2b53e7eec75b3ea210eceeec4361d14fc4576f27)

commit d5e12c70bba17a5a7fe67ae32613e5486ad5e9f1
Author: Günther Deschner <gd at samba.org>
Date:   Tue Feb 22 21:24:39 2011 +0100

    s3-waf: add check for sendfile on hpux.
    
    Guenther
    (cherry picked from commit 6c32fe5207c4baab12212e9d53b80b41986ed1d7)

commit 52e1b95d7d16b85adac88c4c1907c90713547cb8
Author: Günther Deschner <gd at samba.org>
Date:   Tue Feb 22 21:16:39 2011 +0100

    s3-waf: add check for sendfile on freebsd.
    
    Guenther
    (cherry picked from commit 2babc4fcf47ad865e301ce22cceff4e0b0429de9)

commit ec926be00e23ebc762286bc2a1dc5c4168b56407
Author: Günther Deschner <gd at samba.org>
Date:   Tue Feb 22 21:11:15 2011 +0100

    s3-waf: add check for sendfile on linux.
    
    Guenther
    (cherry picked from commit d71c024131d4b108e5c6b4eacf5a75fef8c69215)

commit a9c8601db5f100fd8631d80280f9004c5348da79
Author: Günther Deschner <gd at samba.org>
Date:   Tue Feb 22 20:43:23 2011 +0100

    s3-waf: make sure ENABLE_BUILD_FARM_HACKS is enabled when run on the buildfarm.
    
    Guenther
    (cherry picked from commit ef896e647a1b19f8d0fc35dad823401e24354435)

commit 5baca4dac701251bad96d1acbb0116cb852f65c0
Author: Günther Deschner <gd at samba.org>
Date:   Tue Feb 22 19:45:24 2011 +0100

    s3-includes: move some chgpasswd related defines to the locations where they are used.
    
    Guenther
    (cherry picked from commit 28b4b059386b4369d6ad85c82bbc150aa81609c4)

commit d0f402ceb079828899aabd21ee2cb58ec15f17ff
Author: Günther Deschner <gd at samba.org>
Date:   Tue Feb 22 12:43:12 2011 +0100

    s3-waf: add check for ftruncate extend.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Tue Feb 22 13:35:48 CET 2011 on sn-devel-104
    (cherry picked from commit 79b41dcae14764612946cef012ca20c61dace919)

commit bc9f8058313a095f74492d3fa941181e3d486480
Author: Günther Deschner <gd at samba.org>
Date:   Tue Feb 22 11:57:23 2011 +0100

    s3-waf: add check for realpath() NULL arg.
    
    Guenther
    (cherry picked from commit 4fe3ecefa04d7ca1321109574014950503fca5b8)

commit 794bda5efbd85eac87c3553320fb60b71e629be2
Author: Günther Deschner <gd at samba.org>
Date:   Tue Feb 22 11:53:51 2011 +0100

    s3-waf: add check for makedev().
    
    Guenther
    (cherry picked from commit 33d676cd7e34ca5b9ed5ea0c99bcbda441b3b95f)

commit 7e44d0f2d9539c596c8f0b2bc8bf52b79022ca70
Author: Günther Deschner <gd at samba.org>
Date:   Tue Feb 22 11:49:52 2011 +0100

    s3-waf: add check for TIME_T_MAX.
    
    Guenther
    (cherry picked from commit bd333551bd5a2436773a1541a28e3e47c0e08533)

commit 328b8b3f427c933425ca74ecebf1e904ec0a9ab1
Author: Günther Deschner <gd at samba.org>
Date:   Tue Feb 22 11:41:06 2011 +0100

    s3-waf: add check for /proc/sys/kernel/core_pattern.
    
    Guenther
    (cherry picked from commit 2984003275ed415268b2e135bf71380ab9ae9ef3)

commit 6f30626a4be749d6975c9a2bb53e61e1d56f2a79
Author: Günther Deschner <gd at samba.org>
Date:   Mon Feb 21 14:03:23 2011 +0100

    s4-smbtorture: use torture_comment() instead of printf in raw.write test.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Mon Feb 21 15:26:38 CET 2011 on sn-devel-104
    (cherry picked from commit fb45c8890458dd15db1add360f5761d3ef4d60ee)

commit 360c39de8f37ebecee578d12469a309d6d6dbcbb
Author: Günther Deschner <gd at samba.org>
Date:   Mon Feb 21 14:01:27 2011 +0100

    s4-smbtorture: fix some indent in raw.write test.
    
    Guenther
    (cherry picked from commit 138533da3c7cdfb8fc1c35b7c051347dfa8f821b)

commit d876fa45f21056455d40b7dc71d8d3e12b3d0f73
Author: Günther Deschner <gd at samba.org>
Date:   Mon Feb 21 14:00:08 2011 +0100

    s4-smbtorture: fix trailing whitespace in raw.write test.
    
    Guenther
    (cherry picked from commit e1f4f0b6052662eabf63d127eff0c3ea8df16972)

commit 5ddb084376da201fd3a3cc985b396dbe1677f74e
Author: Günther Deschner <gd at samba.org>
Date:   Fri Feb 18 15:54:51 2011 +0100

    s3-smbsharemodes: libsmbsharemodes does neither depend on krb5 or ldap.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Fri Feb 18 16:46:35 CET 2011 on sn-devel-104
    (cherry picked from commit 927792b21235bf8409ea04022b2912728f21d79e)

commit 6a2d9f46c57c2896fe27cda4eca4df3017d47783
Author: Günther Deschner <gd at samba.org>
Date:   Fri Feb 18 15:40:59 2011 +0100

    nsswitch: make libwbclient a public library again.
    
    Guenther
    (cherry picked from commit 9154f0b4510ec9e3c7916b5fd3f37c441bd8c490)

-----------------------------------------------------------------------

Summary of changes:
 docs-xml/manpages-3/wbinfo.1.xml             |  101 ++++++++++-
 nsswitch/libwbclient/wscript_build           |    2 +-
 source3/auth/pass_check.c                    |    6 +
 source3/include/includes.h                   |   12 --
 source3/include/krb5_protos.h                |    2 -
 source3/include/proto.h                      |   40 ----
 source3/modules/onefs.h                      |    3 -
 source3/pkgconfig/smbsharemodes.pc.in        |    2 +-
 source3/rpc_server/samr/srv_samr_chgpasswd.c |    6 +
 source3/winbindd/idmap_adex/idmap_adex.h     |    2 -
 source3/winbindd/idmap_proto.h               |    2 -
 source3/winbindd/winbindd_proto.h            |    2 -
 source3/wscript                              |  258 ++++++++++++++++++++++++++
 source4/torture/raw/write.c                  |  183 +++++++++---------
 14 files changed, 462 insertions(+), 159 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/nsswitch/libwbclient/wscript_build b/nsswitch/libwbclient/wscript_build
index 896e17d..d925515 100644
--- a/nsswitch/libwbclient/wscript_build
+++ b/nsswitch/libwbclient/wscript_build
@@ -4,5 +4,5 @@ bld.SAMBA_LIBRARY('wbclient',
 	source='wbc_guid.c wbc_idmap.c wbclient.c wbc_pam.c wbc_pwd.c wbc_sid.c wbc_util.c',
 	deps='winbind-client',
 	public_headers='wbclient.h',
-	private_library=True
+	vnum='0'
 	)
diff --git a/source3/auth/pass_check.c b/source3/auth/pass_check.c
index c61a10b..d3b9b92 100644
--- a/source3/auth/pass_check.c
+++ b/source3/auth/pass_check.c
@@ -25,6 +25,12 @@
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH
 
+/* what is the longest significant password available on your system?
+ Knowing this speeds up password searches a lot */
+#ifndef PASSWORD_LENGTH
+#define PASSWORD_LENGTH 8
+#endif
+
 /* these are kept here to keep the string_combinations function simple */
 static char *ths_user;
 
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 2c67a75..e29503f 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -733,18 +733,6 @@ enum flush_reason_enum {
 #define OSF1_ENH_SEC 1
 #endif
 
-#ifndef ALLOW_CHANGE_PASSWORD
-#if (defined(HAVE_TERMIOS_H) && defined(HAVE_DUP2) && defined(HAVE_SETSID))
-#define ALLOW_CHANGE_PASSWORD 1
-#endif
-#endif
-
-/* what is the longest significant password available on your system? 
- Knowing this speeds up password searches a lot */
-#ifndef PASSWORD_LENGTH
-#define PASSWORD_LENGTH 8
-#endif
-
 #if defined(HAVE_CRYPT16) && defined(HAVE_GETAUTHUID)
 #define ULTRIX_AUTH 1
 #endif
diff --git a/source3/include/krb5_protos.h b/source3/include/krb5_protos.h
index 7ac0f3e..530122b 100644
--- a/source3/include/krb5_protos.h
+++ b/source3/include/krb5_protos.h
@@ -74,8 +74,6 @@ krb5_error_code smb_krb5_verify_checksum(krb5_context context,
 					 uint8 *data,
 					 size_t length);
 time_t get_authtime_from_tkt(krb5_ticket *tkt);
-void smb_krb5_free_ap_req(krb5_context context,
-			  krb5_ap_req *ap_req);
 krb5_error_code smb_krb5_get_keyinfo_from_ap_req(krb5_context context,
 						 const krb5_data *inbuf,
 						 krb5_kvno *kvno,
diff --git a/source3/include/proto.h b/source3/include/proto.h
index f584216..b411c5f 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -2075,10 +2075,6 @@ NTSTATUS cli_get_ea_list_path(struct cli_state *cli, const char *path,
 		TALLOC_CTX *ctx,
 		size_t *pnum_eas,
 		struct ea_struct **pea_list);
-bool cli_get_ea_list_fnum(struct cli_state *cli, uint16_t fnum,
-		TALLOC_CTX *ctx,
-		size_t *pnum_eas,
-		struct ea_struct **pea_list);
 struct tevent_req *cli_posix_open_send(TALLOC_CTX *mem_ctx,
 					struct event_context *ev,
 					struct cli_state *cli,
@@ -4184,37 +4180,6 @@ NTSTATUS rpc_transport_np_init(TALLOC_CTX *mem_ctx, struct cli_state *cli,
 			       struct rpc_cli_transport **presult);
 struct cli_state *rpc_pipe_np_smb_conn(struct rpc_pipe_client *p);
 
-/* The following definitions come from rpc_client/rpc_transport_smbd.c  */
-
-struct tevent_req *rpc_cli_smbd_conn_init_send(TALLOC_CTX *mem_ctx,
-					       struct event_context *ev,
-					       void (*stdout_callback)(char *buf,
-								       size_t len,
-								       void *priv),
-					       void *priv);
-NTSTATUS rpc_cli_smbd_conn_init_recv(struct tevent_req *req,
-				     TALLOC_CTX *mem_ctx,
-				     struct rpc_cli_smbd_conn **pconn);
-NTSTATUS rpc_cli_smbd_conn_init(TALLOC_CTX *mem_ctx,
-				struct rpc_cli_smbd_conn **pconn,
-				void (*stdout_callback)(char *buf,
-							size_t len,
-							void *priv),
-				void *priv);
-
-struct tevent_req *rpc_transport_smbd_init_send(TALLOC_CTX *mem_ctx,
-						struct event_context *ev,
-						struct rpc_cli_smbd_conn *conn,
-						const struct ndr_syntax_id *abstract_syntax);
-NTSTATUS rpc_transport_smbd_init_recv(struct tevent_req *req,
-				      TALLOC_CTX *mem_ctx,
-				      struct rpc_cli_transport **presult);
-NTSTATUS rpc_transport_smbd_init(TALLOC_CTX *mem_ctx,
-				 struct rpc_cli_smbd_conn *conn,
-				 const struct ndr_syntax_id *abstract_syntax,
-				 struct rpc_cli_transport **presult);
-struct cli_state *rpc_pipe_smbd_smb_conn(struct rpc_pipe_client *p);
-
 /* The following definitions come from rpc_client/rpc_transport_sock.c  */
 
 NTSTATUS rpc_transport_sock_init(TALLOC_CTX *mem_ctx, int fd,
@@ -4320,11 +4285,6 @@ void do_drv_upgrade_printer(struct messaging_context *msg,
 			    struct server_id server_id,
 			    DATA_BLOB *data);
 void update_monitored_printq_cache(struct messaging_context *msg_ctx);
-void reset_all_printerdata(struct messaging_context *msg,
-			   void *private_data,
-			   uint32_t msg_type,
-			   struct server_id server_id,
-			   DATA_BLOB *data);
 
 /* The following definitions come from rpc_server/srv_srvsvc_nt.c  */
 
diff --git a/source3/modules/onefs.h b/source3/modules/onefs.h
index cd7782c..e7ac0eb 100644
--- a/source3/modules/onefs.h
+++ b/source3/modules/onefs.h
@@ -138,9 +138,6 @@ NTSTATUS onefs_samba_sd_to_sd(uint32_t security_info_sent,
 			      struct ifs_security_descriptor *sd, int snum,
 			      uint32_t *security_info_effective);
 
-NTSTATUS onefs_split_ntfs_stream_name(TALLOC_CTX *mem_ctx, const char *fname,
-				      char **pbase, char **pstream);
-
 NTSTATUS onefs_stream_prep_smb_fname(TALLOC_CTX *ctx,
 				     const struct smb_filename *smb_fname_in,
 				     struct smb_filename **smb_fname_out);
diff --git a/source3/pkgconfig/smbsharemodes.pc.in b/source3/pkgconfig/smbsharemodes.pc.in
index dcb0d2e..1af7d4f 100644
--- a/source3/pkgconfig/smbsharemodes.pc.in
+++ b/source3/pkgconfig/smbsharemodes.pc.in
@@ -9,6 +9,6 @@ Version: 0
 URL: http://www.samba.org/
 #Libs: -L at libdir@ -lsmbsharemodes
 Libs: -lsmbsharemodes
-Libs.private: -lsmbsharemodes @KRB5_LIBS@ @LDAP_LIBS@ @LIBS@
+Libs.private: -lsmbsharemodes @LIBS@
 Cflags: -I at includedir@
 
diff --git a/source3/rpc_server/samr/srv_samr_chgpasswd.c b/source3/rpc_server/samr/srv_samr_chgpasswd.c
index 85a63a5..8a68226 100644
--- a/source3/rpc_server/samr/srv_samr_chgpasswd.c
+++ b/source3/rpc_server/samr/srv_samr_chgpasswd.c
@@ -50,6 +50,12 @@
 #include "../lib/crypto/arcfour.h"
 #include "rpc_server/samr/srv_samr_util.h"
 
+#ifndef ALLOW_CHANGE_PASSWORD
+#if (defined(HAVE_TERMIOS_H) && defined(HAVE_DUP2) && defined(HAVE_SETSID))
+#define ALLOW_CHANGE_PASSWORD 1
+#endif
+#endif
+
 #if ALLOW_CHANGE_PASSWORD
 
 static int findpty(char **slave)
diff --git a/source3/winbindd/idmap_adex/idmap_adex.h b/source3/winbindd/idmap_adex/idmap_adex.h
index cfb3b80..61befeb 100644
--- a/source3/winbindd/idmap_adex/idmap_adex.h
+++ b/source3/winbindd/idmap_adex/idmap_adex.h
@@ -170,8 +170,6 @@ bool cell_list_remove(struct likewise_cell * cell);
 
 void cell_list_destroy(void);
 void cell_destroy(struct likewise_cell *c);
-void cell_set_forest_searches(struct likewise_cell *c,
-				bool search);
 void cell_set_dns_domain(struct likewise_cell *c,
 			   const char *dns_domain);
 void cell_set_connection(struct likewise_cell *c,
diff --git a/source3/winbindd/idmap_proto.h b/source3/winbindd/idmap_proto.h
index 42900a6..efe7ac6 100644
--- a/source3/winbindd/idmap_proto.h
+++ b/source3/winbindd/idmap_proto.h
@@ -12,8 +12,6 @@ NTSTATUS idmap_backends_unixid_to_sid(const char *domname,
 				      struct id_map *id);
 NTSTATUS idmap_backends_sid_to_unixid(const char *domname,
 				      struct id_map *id);
-NTSTATUS idmap_new_mapping(const struct dom_sid *psid, enum id_type type,
-			   struct unixid *pxid);
 
 /* The following definitions come from winbindd/idmap_nss.c  */
 
diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h
index c822baa..874112b 100644
--- a/source3/winbindd/winbindd_proto.h
+++ b/source3/winbindd/winbindd_proto.h
@@ -151,8 +151,6 @@ void winbindd_ccache_ntlm_auth(struct winbindd_cli_state *state);
 enum winbindd_result winbindd_dual_ccache_ntlm_auth(struct winbindd_domain *domain,
 						struct winbindd_cli_state *state);
 void winbindd_ccache_save(struct winbindd_cli_state *state);
-enum winbindd_result winbindd_dual_ccache_save(
-	struct winbindd_domain *domain, struct winbindd_cli_state *state);
 
 /* The following definitions come from winbindd/winbindd_cm.c  */
 
diff --git a/source3/wscript b/source3/wscript
index 8439e0e..1e60d78 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -1123,6 +1123,264 @@ syscall(SYS_initgroups, 16, NULL, NULL, 0);
 				    define='HAVE_STRUCT_SIGEVENT_SIGEV_VALUE_SIGVAL_PTR',
 				    headers='signal.h');
 
+    if os.path.exists('/proc/sys/kernel/core_pattern'):
+        conf.DEFINE('HAVE_SYS_KERNEL_PROC_CORE_PATTERN', '1')
+
+    if conf.CHECK_CODE('''
+#include <time.h>
+main() {
+	struct tm *tm;
+	if (sizeof(time_t) == 8) {
+		time_t max_time = 0x7fffffffffffffffll;
+		tm = gmtime(&max_time);
+		/* This should fail with 32-bit tm_year. */
+		if (tm == NULL) {
+			/* Max time_t that works with 32-bit int tm_year in struct tm. */
+			max_time = 67768036191676799ll;
+			tm = gmtime(&max_time);
+			if (tm) {
+				exit(0);
+			}
+		}
+	}
+	exit(1);
+}''',
+	'__TIME_T_MAX',
+	addmain=False,
+	execute=True,
+	msg="Checking for the maximum value of the 'time_t' type"):
+            conf.DEFINE('TIME_T_MAX', '67768036191676799ll')
+
+    conf.CHECK_CODE('''
+#if defined(HAVE_UNISTD_H)
+#include <unistd.h>
+#endif
+#include <sys/types.h>
+main() { dev_t dev = makedev(1,2); return 0; }
+''',
+	'HAVE_MAKEDEV',
+	addmain=False,
+	msg='Checking whether the macro for makedev is available')
+
+    conf.CHECK_CODE('''
+#include <stdio.h>
+#include <limits.h>
+#include <signal.h>
+
+void exit_on_core(int ignored) {
+	exit(1);
+}
+
+main() {
+	char *newpath;
+	signal(SIGSEGV, exit_on_core);
+	newpath = realpath("/tmp", NULL);
+	exit((newpath != NULL) ? 0 : 1);
+}
+''',
+	'REALPATH_TAKES_NULL',
+	addmain=False,
+	execute=True,
+	msg='Checking whether the realpath function allows a NULL argument')
+
+    conf.CHECK_CODE('''#include "../tests/ftruncate.c"''',
+		    'HAVE_FTRUNCATE_EXTEND',
+		    msg='Checking for ftruncate extend',
+		    addmain=False,
+		    execute=True)
+
+    if os.environ.get('RUN_FROM_BUILD_FARM') is not None:
+        conf.define('ENABLE_BUILD_FARM_HACKS', '1')
+
+    if Options.options.with_sendfile_support:
+        if (host_os.rfind('linux') > -1) or (host_os.rfind('gnu') > -1) or (host_os.rfind('k*bsd*-gnu') > -1) or (host_os.rfind('kopensolaris*-gnu') > -1):
+            conf.CHECK_CODE('''
+			    int tofd, fromfd;
+			    off64_t offset;
+			    size_t total;
+			    ssize_t nwritten = sendfile64(tofd, fromfd, &offset, total);
+			    ''',
+			    '_HAVE_SENDFILE64',
+			    headers='sys/sendfile',
+			    msg='Checking for linux sendfile64 support')
+            conf.CHECK_CODE('''
+			    int tofd, fromfd;
+			    off_t offset;
+			    size_t total;
+			    ssize_t nwritten = sendfile(tofd, fromfd, &offset, total);
+			    ''',


-- 
Samba Shared Repository


More information about the samba-cvs mailing list