[SCM] Samba Shared Repository - branch v3-6-test updated
Günther Deschner
gd at samba.org
Mon Feb 14 04:36:56 MST 2011
The branch, v3-6-test has been updated
via ae4aa2e s3-librpc: no need to globally include endpointmapper headers.
via ebe3122 s3: move some defines to a better place.
via a9ecea5 s3-proto: remove prototype for non-existing functions.
via 251bc67 s3-librpc: remove duplicate prototypes.
from fdc14dc s3: Make "smbpasswd <user>" work with pdb_ads (cherry picked from commit 22b69b2927bf10aa78be686894a425cfda02d916)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit ae4aa2e5f7e151a2b5224c6559330d3467643ad5
Author: Günther Deschner <gd at samba.org>
Date: Sat Feb 12 03:09:41 2011 +0100
s3-librpc: no need to globally include endpointmapper headers.
Guenther
Autobuild-User: Günther Deschner <gd at samba.org>
Autobuild-Date: Mon Feb 14 12:31:56 CET 2011 on sn-devel-104
(cherry picked from commit b3ea56ae16a35adc974287b83d6061ce5ffe454e)
commit ebe3122912b68ae4e46e9c12232f766f08ca9415
Author: Günther Deschner <gd at samba.org>
Date: Sat Feb 12 02:51:19 2011 +0100
s3: move some defines to a better place.
Guenther
(cherry picked from commit 80b4e1e9856ed180015e32af2d8762a9acd83910)
commit a9ecea546d79bad175b4fb2eeb99585027a33f30
Author: Günther Deschner <gd at samba.org>
Date: Sat Feb 12 02:24:26 2011 +0100
s3-proto: remove prototype for non-existing functions.
Guenther
(cherry picked from commit f10cba1a0133199f1e7a6db0d70c50834e41b4bd)
commit 251bc67da3eea2c1891cb75735abc7c42156442e
Author: Günther Deschner <gd at samba.org>
Date: Sat Feb 12 02:23:57 2011 +0100
s3-librpc: remove duplicate prototypes.
Guenther
(cherry picked from commit 9d9659896bd8d765a77b967d3c98806acc327bde)
-----------------------------------------------------------------------
Summary of changes:
source3/include/includes.h | 21 ++++-----------------
source3/include/proto.h | 22 ----------------------
source3/include/smb.h | 1 -
source3/lib/system.c | 11 +++++++++++
source3/librpc/rpc/dcerpc.h | 17 ++++++++++++++++-
5 files changed, 31 insertions(+), 41 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 87061eb..8c4fcfe 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -179,6 +179,10 @@ typedef int ber_int_t;
#if !defined(LDAPS_PORT)
#define LDAPS_PORT 636
#endif
+
+/* function declarations not included in proto.h */
+LDAP *ldap_open_with_timeout(const char *server, int port, unsigned int to);
+
#else
#undef HAVE_LDAP
#endif
@@ -556,16 +560,6 @@ enum timestamp_set_resolution {
TIMESTAMP_SET_NT_OR_BETTER
};
-#ifdef HAVE_BROKEN_GETGROUPS
-#define GID_T int
-#else
-#define GID_T gid_t
-#endif
-
-#ifndef NGROUPS_MAX
-#define NGROUPS_MAX 32 /* Guess... */
-#endif
-
/* Our own fstrings */
/*
@@ -844,13 +838,6 @@ char *talloc_asprintf_strupper_m(TALLOC_CTX *t, const char *fmt, ...) PRINTF_ATT
#define XATTR_REPLACE 0x2 /* set value, fail if attr does not exist */
#endif
-#ifdef HAVE_LDAP
-
-/* function declarations not included in proto.h */
-LDAP *ldap_open_with_timeout(const char *server, int port, unsigned int to);
-
-#endif /* HAVE_LDAP */
-
#if defined(HAVE_LINUX_READAHEAD) && ! defined(HAVE_READAHEAD_DECL)
ssize_t readahead(int fd, off64_t offset, size_t count);
#endif
diff --git a/source3/include/proto.h b/source3/include/proto.h
index a4e8ad5..f584216 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -334,10 +334,6 @@ bool pdb_get_dom_grp_info(const struct dom_sid *sid, struct acct_info *info);
bool pdb_set_dom_grp_info(const struct dom_sid *sid, const struct acct_info *info);
NTSTATUS pdb_create_builtin_alias(uint32 rid);
-/* The following definitions come from groupdb/mapping_ldb.c */
-
-const struct mapping_backend *groupdb_ldb_init(void);
-
/* The following definitions come from groupdb/mapping_tdb.c */
const struct mapping_backend *groupdb_tdb_init(void);
@@ -2597,24 +2593,6 @@ NTSTATUS check_negative_conn_cache( const char *domain, const char *server);
void add_failed_connection_entry(const char *domain, const char *server, NTSTATUS result) ;
void flush_negative_conn_cache_for_domain(const char *domain);
-/* The following definitions come from ../librpc/rpc/dcerpc_error.c */
-
-const char *dcerpc_errstr(TALLOC_CTX *mem_ctx, uint32_t fault_code);
-NTSTATUS dcerpc_fault_to_nt_status(uint32_t fault_code);
-
-/* The following definitions come from ../librpc/rpc/dcerpc_util.c */
-
-void dcerpc_set_frag_length(DATA_BLOB *blob, uint16_t v);
-uint16_t dcerpc_get_frag_length(const DATA_BLOB *blob);
-void dcerpc_set_auth_length(DATA_BLOB *blob, uint16_t v);
-uint8_t dcerpc_get_endian_flag(DATA_BLOB *blob);
-NTSTATUS dcerpc_pull_auth_trailer(struct ncacn_packet *pkt,
- TALLOC_CTX *mem_ctx,
- DATA_BLOB *pkt_trailer,
- struct dcerpc_auth *auth,
- uint32_t *auth_length,
- bool auth_data_only);
-
/* The following definitions come from libsmb/dsgetdcname.c */
struct netr_DsRGetDCNameInfo;
diff --git a/source3/include/smb.h b/source3/include/smb.h
index f99bf59..6d0af8e 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -171,7 +171,6 @@ typedef union unid_t {
|LOOKUP_NAME_WKN\
|LOOKUP_NAME_DOMAIN)
-#include "librpc/gen_ndr/epmapper.h"
#include "librpc/gen_ndr/dcerpc.h"
#include "librpc/gen_ndr/security.h"
diff --git a/source3/lib/system.c b/source3/lib/system.c
index 48623b9..24d3c09 100644
--- a/source3/lib/system.c
+++ b/source3/lib/system.c
@@ -1134,6 +1134,10 @@ void sys_srandom(unsigned int seed)
#endif
}
+#ifndef NGROUPS_MAX
+#define NGROUPS_MAX 32 /* Guess... */
+#endif
+
/**************************************************************************
Returns equivalent to NGROUPS_MAX - using sysconf if needed.
****************************************************************************/
@@ -1154,6 +1158,13 @@ int groups_max(void)
****************************************************************************/
#if defined(HAVE_BROKEN_GETGROUPS)
+
+#ifdef HAVE_BROKEN_GETGROUPS
+#define GID_T int
+#else
+#define GID_T gid_t
+#endif
+
static int sys_broken_getgroups(int setlen, gid_t *gidset)
{
GID_T gid;
diff --git a/source3/librpc/rpc/dcerpc.h b/source3/librpc/rpc/dcerpc.h
index 3183645..637c31a 100644
--- a/source3/librpc/rpc/dcerpc.h
+++ b/source3/librpc/rpc/dcerpc.h
@@ -101,6 +101,8 @@ struct dcerpc_binding {
/* The following definitions come from librpc/rpc/binding.c */
+struct epm_floor;
+struct epm_tower;
const char *epm_floor_string(TALLOC_CTX *mem_ctx, struct epm_floor *epm_floor);
_PUBLIC_ char *dcerpc_binding_string(TALLOC_CTX *mem_ctx, const struct dcerpc_binding *b);
_PUBLIC_ NTSTATUS dcerpc_parse_binding(TALLOC_CTX *mem_ctx, const char *s, struct dcerpc_binding **b_out);
@@ -168,7 +170,8 @@ struct ndr_pull;
struct tevent_context;
struct tstream_context;
-/* from ../librpc/rpc/dcerpc_util.c */
+/* The following definitions come from ../librpc/rpc/dcerpc_util.c */
+
void dcerpc_set_frag_length(DATA_BLOB *blob, uint16_t v);
uint16_t dcerpc_get_frag_length(const DATA_BLOB *blob);
void dcerpc_set_auth_length(DATA_BLOB *blob, uint16_t v);
@@ -179,6 +182,18 @@ NTSTATUS dcerpc_read_ncacn_packet_recv(struct tevent_req *req,
TALLOC_CTX *mem_ctx,
struct ncacn_packet **pkt,
DATA_BLOB *buffer);
+uint8_t dcerpc_get_endian_flag(DATA_BLOB *blob);
+NTSTATUS dcerpc_pull_auth_trailer(struct ncacn_packet *pkt,
+ TALLOC_CTX *mem_ctx,
+ DATA_BLOB *pkt_trailer,
+ struct dcerpc_auth *auth,
+ uint32_t *auth_length,
+ bool auth_data_only);
+
+/* The following definitions come from ../librpc/rpc/dcerpc_error.c */
+
+const char *dcerpc_errstr(TALLOC_CTX *mem_ctx, uint32_t fault_code);
+NTSTATUS dcerpc_fault_to_nt_status(uint32_t fault_code);
/*
* This is just a hack this should never be used in code,
--
Samba Shared Repository
More information about the samba-cvs
mailing list