[SCM] Samba Shared Repository - branch v3-2-stable updated -
release-3-2-3-51-gd3db59a
Karolin Seeger
kseeger at samba.org
Mon Sep 8 09:50:47 GMT 2008
The branch, v3-2-stable has been updated
via d3db59a5b171e9bb9662199699722a7a3a9f0a57 (commit)
via 4231a5dc6b132c629adf5378d51000fe5ed30e60 (commit)
via 3749682921829162a6d35e4d589adc16cec4a9e5 (commit)
via c23752019b21bcfb6e60df521e0f634d77a1326e (commit)
via b6729d624129a122efe9c61293abb75e5abc923c (commit)
via da5cfd914492240b01269daeee314524680de817 (commit)
via 2d60a50cd25ef0ca7a7534c2f2d818ced42ed5b5 (commit)
via f1236f7a81b753666ed87f450679ab14f1381ed5 (commit)
via 482f5736aafc1396d11bb596fb9939d24b9435dd (commit)
via a13e5579c9ee2910e3b0408562d31ed3ff1db47a (commit)
via 0b9b4c5e4b920a5e2ac503f780839ac331c3990d (commit)
via 9d65db33f387e04989bbbbe3a7c5ed42077e23d8 (commit)
via d005b533d7ba11a70ff86c696ff11ec9b06046c8 (commit)
via db403413e9472ce477c1b6988a4719abcba79a2e (commit)
via 4f61fc18e2cd557f6e54cefef16506d9e144513e (commit)
via 7062d45182a64219e8e4769f76873bfe81fef02b (commit)
via 4e780f0d41fdf4f8dda0cde13e27e7e2a31e03c3 (commit)
from 00a721a2d2d2e8d753713869e91cf8d8df745c63 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable
- Log -----------------------------------------------------------------
commit d3db59a5b171e9bb9662199699722a7a3a9f0a57
Author: Jeremy Allison <jra at samba.org>
Date: Fri Sep 5 15:35:04 2008 -0700
Remove unecessary msync.
Jeremy.
(cherry picked from commit d7eab4b20af47401d281dd672e012d4eb96e5f4a)
commit 4231a5dc6b132c629adf5378d51000fe5ed30e60
Author: Qiao Yang <geoyang at ironport.com>
Date: Fri Sep 5 14:08:09 2008 +0200
Fix a memleak
request.extra_data is not freed if there is no extra_data in response or
when there is some error happens in processing. This patch will free the
buffer right after processing a request before sending back a response.
(cherry picked from commit be6f12273f171a3eb1967d2299064e57d737f6a4)
(cherry picked from commit 72865f5e4ff30861d58b928baaf7be3373301f37)
commit 3749682921829162a6d35e4d589adc16cec4a9e5
Author: Volker Lendecke <vl at sernet.de>
Date: Fri Sep 5 11:48:36 2008 +0200
Do proper error handling if the socket is closed
This is a step in fixing bug 5707.
Thanks to Igor Galić <i.galic at brainsware.org> for reporting!
Volker
(cherry picked from commit 1558a5c1977b1f87600ec487238fa8db009f41fd)
commit c23752019b21bcfb6e60df521e0f634d77a1326e
Author: Michael Adam <obnox at samba.org>
Date: Tue Aug 26 17:19:33 2008 +0200
run "make idl" after after idl change "Handle arbitrary new PAC types"
Michael
(cherry picked from commit cc54b4d74171d27e7a0b09aff0376804ac7ab69b)
commit b6729d624129a122efe9c61293abb75e5abc923c
Author: Andrew Tridgell <tridge at samba.org>
Date: Sun Aug 24 14:00:58 2008 +1000
Handle arbitrary new PAC types
When MS introduces a new PAC type, we should just ignore it, not
generate a parse error. New PAC info structures are supposed to be
backwards compatible with old ones
(cherry picked from commit 2971b926c835412b02c93ad1e30f1471bc0a3612)
(cherry picked from commit 843e9ebbf63f84270f8638a8e79538523b2148a8)
commit da5cfd914492240b01269daeee314524680de817
Author: Michael Adam <obnox at samba.org>
Date: Tue Aug 26 17:17:14 2008 +0200
re-run make idl after Jelmer's "poperly cast array lengths" pidl change.
(f321240fa91fa19c1131f119c42f64897d220682)
Michael
(cherry picked from commit cd3f4ee593e606e48cd104df222f8bda8e370a58)
commit 2d60a50cd25ef0ca7a7534c2f2d818ced42ed5b5
Author: Andrew Tridgell <tridge at samba.org>
Date: Sun Aug 24 13:53:19 2008 +1000
fixed an errno handling bug that could lead to an infinite loop
(cherry picked from commit 5ccdc58ce91ee40ca7171dd040191291aeb7fe02)
(cherry picked from commit 1361caecb355047001f8a351ec2e6f10d7f0e741)
commit f1236f7a81b753666ed87f450679ab14f1381ed5
Author: Andrew Tridgell <tridge at samba.org>
Date: Sat Aug 23 11:36:27 2008 +1000
fixed tsmsm_sendfile(). The logic was totally broken.
(cherry picked from commit 794e48b809036871287df8416a2c669b7e26f216)
(cherry picked from commit 3ce3f7f58402b98ce386bab1c40988e5ccd40d15)
commit 482f5736aafc1396d11bb596fb9939d24b9435dd
Author: Michael Adam <obnox at samba.org>
Date: Fri Sep 5 11:39:38 2008 +0200
configure: fix typo in GNU ld version-script test.
Michael
(cherry picked from commit 0d9f3dfc4c139938ee57b6cf60c29cf4ce404be7)
(cherry picked from commit 2381ec3b3f6a4798c15f4d3f3aee8caea8f48941)
commit a13e5579c9ee2910e3b0408562d31ed3ff1db47a
Author: James Ding <ding_cc at hotmail.com>
Date: Thu Sep 4 15:17:18 2008 -0700
Fix winbindd crash bug with trusted domains. Bug #5736
(cherry picked from commit 2d84b9a1024f68657f75aa7e0c4091b8c7afd194)
commit 0b9b4c5e4b920a5e2ac503f780839ac331c3990d
Author: Herb Lewis <herb at samba.org>
Date: Thu Sep 4 14:32:09 2008 -0700
get rid of unneeded argument for get_alloc_methods as well
(cherry picked from commit 59415cb8b3ce7981dbf576086e13675f343581a4)
commit 9d65db33f387e04989bbbbe3a7c5ed42077e23d8
Author: Herb Lewis <herb at samba.org>
Date: Thu Sep 4 13:58:06 2008 -0700
get rid of unneeded argument for get_methods
(cherry picked from commit 2a085d5343ab954e1bd60c11033506dc7c9040e3)
commit d005b533d7ba11a70ff86c696ff11ec9b06046c8
Author: Steven Danneman <steven.danneman at isilon.com>
Date: Thu Sep 4 12:05:13 2008 -0700
Cleanup of DC enumeration in get_dcs()
This is a fix for a few small inefficiencies/bugs in the get_dcs() path.
* because the third add_one_dc_unique() loop was outside the ADS check all DCs
returned from the non-sitename lookup were being tacked onto the dc_name_ip
list twice.
* add_one_dc_unique() now checks if the given IP address already exists before
adding it to the list, making the returned list actually unique
* added more thorough doxygen comment headers
(cherry picked from commit edd234e7a22dab105256f90df36d86f168dcea4c)
commit db403413e9472ce477c1b6988a4719abcba79a2e
Author: Günther Deschner <gd at samba.org>
Date: Thu Sep 4 15:11:22 2008 +0200
kerberos: fix indent of enc type lines in generated krb5.conf files.
Guenther
(cherry picked from commit 18a26f08b6fab4119a1421a7ca59c32dde8bb8cb)
(cherry picked from commit 8d6220a94667c5906ead5fa80b6afabc82159b53)
commit 4f61fc18e2cd557f6e54cefef16506d9e144513e
Author: Jeremy Allison <jra at samba.org>
Date: Wed Sep 3 13:06:20 2008 -0700
Fix bug #5729. Explicitly allow "-valid".
Jeremy
(cherry picked from commit 96b5e691149c449253e4875a743c8603b3298c2b)
commit 7062d45182a64219e8e4769f76873bfe81fef02b
Author: Simo Sorce <idra at samba.org>
Date: Wed Sep 3 10:44:09 2008 -0400
The msync manpage reports that msync *must* be called before munmap. Failure to do so may result in lost data. Fix an ifdef check, I really think we meant to check HAVE_MMAP here.
(cherry picked from commit bfced01a92ae1a4913c0c9aba27e7b43e06f9032)
commit 4e780f0d41fdf4f8dda0cde13e27e7e2a31e03c3
Author: Volker Lendecke <vl at sernet.de>
Date: Mon Sep 1 13:46:27 2008 +0200
Fix Coverity ID 587
The following test program prints "8" on 64-bit :-)
static void print_size(const char lenbuf[4])
{
printf("sizeof(lenbuf) = %d\n", (int)sizeof(lenbuf));
}
int main(void)
{
const char lenbuf[4];
print_size(lenbuf);
return 0;
}
Jeremy, please check :-)
Volker
(cherry picked from commit 9daea0ccfdda58450be3c9a9a94c016f5900c319)
(cherry picked from commit 11fdeeeb551ac3287b75e114b15bc4f76cf2d337)
-----------------------------------------------------------------------
Summary of changes:
source/configure.in | 2 +-
source/lib/tdb/common/io.c | 4 +-
source/lib/tdb/common/transaction.c | 2 +-
source/lib/util_sock.c | 21 +++++--
source/libads/kerberos.c | 6 +-
source/librpc/gen_ndr/krb5pac.h | 2 +-
source/librpc/gen_ndr/ndr_dfs.c | 22 ++++----
source/librpc/gen_ndr/ndr_echo.c | 2 +-
source/librpc/gen_ndr/ndr_epmapper.c | 10 ++--
source/librpc/gen_ndr/ndr_eventlog.c | 2 +-
source/librpc/gen_ndr/ndr_krb5pac.c | 24 ++------
source/librpc/gen_ndr/ndr_lsa.c | 40 +++++++-------
source/librpc/gen_ndr/ndr_messaging.c | 4 +-
source/librpc/gen_ndr/ndr_netlogon.c | 50 ++++++++--------
source/librpc/gen_ndr/ndr_notify.c | 4 +-
source/librpc/gen_ndr/ndr_ntsvcs.c | 2 +-
source/librpc/gen_ndr/ndr_samr.c | 24 ++++----
source/librpc/gen_ndr/ndr_security.c | 4 +-
source/librpc/gen_ndr/ndr_srvsvc.c | 56 +++++++++---------
source/librpc/gen_ndr/ndr_winreg.c | 4 +-
source/librpc/gen_ndr/ndr_wkssvc.c | 18 +++---
source/librpc/gen_ndr/ndr_xattr.c | 2 +-
source/librpc/idl/krb5pac.idl | 2 +-
source/libsmb/async_smb.c | 10 +++-
source/modules/vfs_tsmsm.c | 15 +++--
source/param/loadparm.c | 2 +-
source/smbd/process.c | 2 +-
source/winbindd/idmap.c | 38 +++++--------
source/winbindd/winbindd.c | 3 +-
source/winbindd/winbindd_ads.c | 2 +
source/winbindd/winbindd_cm.c | 98 +++++++++++++++++++++++++--------
31 files changed, 267 insertions(+), 210 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/configure.in b/source/configure.in
index 3c699d5..a7d1f94 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -257,7 +257,7 @@ if test "$ac_cv_prog_gnu_ld" = "yes"; then
if test "$ac_cv_gnu_ld_vernr_major" -lt 2 || test "$ac_cv_gnu_ld_vernr_minor" -lt 14; then
ac_cv_gnu_ld_no_default_allow_shlib_undefined=yes
fi
- if test "$ac_cv_gnu_ld_vernr_major" -gt 2 || test "$ac_cv_gnu_l= d_vernr_major"=2 && test "$ac_cv_gnu_ld_vernr_minor" -ge 12; then
+ if test "$ac_cv_gnu_ld_vernr_major" -gt 2 || test "$ac_cv_gnu_ld_vernr_major"=2 && test "$ac_cv_gnu_ld_vernr_minor" -ge 12; then
ac_cv_gnu_ld_version_script=yes
fi
fi
diff --git a/source/lib/tdb/common/io.c b/source/lib/tdb/common/io.c
index 172ab69..661f761 100644
--- a/source/lib/tdb/common/io.c
+++ b/source/lib/tdb/common/io.c
@@ -189,7 +189,9 @@ int tdb_munmap(struct tdb_context *tdb)
#ifdef HAVE_MMAP
if (tdb->map_ptr) {
- int ret = munmap(tdb->map_ptr, tdb->map_size);
+ int ret;
+
+ ret = munmap(tdb->map_ptr, tdb->map_size);
if (ret != 0)
return ret;
}
diff --git a/source/lib/tdb/common/transaction.c b/source/lib/tdb/common/transaction.c
index 4e2127b..7acda64 100644
--- a/source/lib/tdb/common/transaction.c
+++ b/source/lib/tdb/common/transaction.c
@@ -563,7 +563,7 @@ static int transaction_sync(struct tdb_context *tdb, tdb_off_t offset, tdb_len_t
TDB_LOG((tdb, TDB_DEBUG_FATAL, "tdb_transaction: fsync failed\n"));
return -1;
}
-#ifdef MS_SYNC
+#ifdef HAVE_MMAP
if (tdb->map_ptr) {
tdb_off_t moffset = offset & ~(tdb->page_size-1);
if (msync(moffset + (char *)tdb->map_ptr,
diff --git a/source/lib/util_sock.c b/source/lib/util_sock.c
index 7356b3e..e20768e 100644
--- a/source/lib/util_sock.c
+++ b/source/lib/util_sock.c
@@ -1379,11 +1379,22 @@ int open_socket_out(int type,
return res;
}
-/****************************************************************************
- Create an outgoing TCP socket to any of the addrs. This is for
- simultaneous connects to port 445 and 139 of a host or even a variety
- of DC's all of which are equivalent for our purposes.
-**************************************************************************/
+/*******************************************************************
+ Create an outgoing TCP socket to the first addr that connects.
+
+ This is for simultaneous connection attempts to port 445 and 139 of a host
+ or for simultatneous connection attempts to multiple DCs at once. We return
+ a socket fd of the first successful connection.
+
+ @param[in] addrs list of Internet addresses and ports to connect to
+ @param[in] num_addrs number of address/port pairs in the addrs list
+ @param[in] timeout time after which we stop waiting for a socket connection
+ to succeed, given in milliseconds
+ @param[out] fd_index the entry in addrs which we successfully connected to
+ @param[out] fd fd of the open and connected socket
+ @return true on a successful connection, false if all connection attempts
+ failed or we timed out
+*******************************************************************/
bool open_any_socket_out(struct sockaddr_storage *addrs, int num_addrs,
int timeout, int *fd_index, int *fd)
diff --git a/source/libads/kerberos.c b/source/libads/kerberos.c
index 25d94d0..6d20547 100644
--- a/source/libads/kerberos.c
+++ b/source/libads/kerberos.c
@@ -881,9 +881,9 @@ bool create_local_private_krb5_conf_for_domain(const char *realm,
file_contents = talloc_asprintf(fname,
"[libdefaults]\n\tdefault_realm = %s\n"
- "default_tgs_enctypes = RC4-HMAC DES-CBC-CRC DES-CBC-MD5\n"
- "default_tkt_enctypes = RC4-HMAC DES-CBC-CRC DES-CBC-MD5\n"
- "preferred_enctypes = RC4-HMAC DES-CBC-CRC DES-CBC-MD5\n\n"
+ "\tdefault_tgs_enctypes = RC4-HMAC DES-CBC-CRC DES-CBC-MD5\n"
+ "\tdefault_tkt_enctypes = RC4-HMAC DES-CBC-CRC DES-CBC-MD5\n"
+ "\tpreferred_enctypes = RC4-HMAC DES-CBC-CRC DES-CBC-MD5\n\n"
"[realms]\n\t%s = {\n"
"\t%s\t}\n",
realm_upper, realm_upper, kdc_ip_string);
diff --git a/source/librpc/gen_ndr/krb5pac.h b/source/librpc/gen_ndr/krb5pac.h
index 2d799ea..b3b29e5 100644
--- a/source/librpc/gen_ndr/krb5pac.h
+++ b/source/librpc/gen_ndr/krb5pac.h
@@ -76,7 +76,7 @@ union PAC_INFO {
struct PAC_SIGNATURE_DATA srv_cksum;/* [case(PAC_TYPE_SRV_CHECKSUM)] */
struct PAC_SIGNATURE_DATA kdc_cksum;/* [case(PAC_TYPE_KDC_CHECKSUM)] */
struct PAC_LOGON_NAME logon_name;/* [case(PAC_TYPE_LOGON_NAME)] */
- struct DATA_BLOB_REM unknown;/* [subcontext(0),case(PAC_TYPE_UNKNOWN_12)] */
+ struct DATA_BLOB_REM unknown;/* [subcontext(0),default] */
}/* [gensize,nodiscriminant,public] */;
struct PAC_BUFFER {
diff --git a/source/librpc/gen_ndr/ndr_dfs.c b/source/librpc/gen_ndr/ndr_dfs.c
index 1897550..db3f5e4 100644
--- a/source/librpc/gen_ndr/ndr_dfs.c
+++ b/source/librpc/gen_ndr/ndr_dfs.c
@@ -502,7 +502,7 @@ _PUBLIC_ void ndr_print_dfs_Info3(struct ndr_print *ndr, const char *name, const
ndr_print_ptr(ndr, "stores", r->stores);
ndr->depth++;
if (r->stores) {
- ndr->print(ndr, "%s: ARRAY(%d)", "stores", r->num_stores);
+ ndr->print(ndr, "%s: ARRAY(%d)", "stores", (int)r->num_stores);
ndr->depth++;
for (cntr_stores_1=0;cntr_stores_1<r->num_stores;cntr_stores_1++) {
char *idx_1=NULL;
@@ -665,7 +665,7 @@ _PUBLIC_ void ndr_print_dfs_Info4(struct ndr_print *ndr, const char *name, const
ndr_print_ptr(ndr, "stores", r->stores);
ndr->depth++;
if (r->stores) {
- ndr->print(ndr, "%s: ARRAY(%d)", "stores", r->num_stores);
+ ndr->print(ndr, "%s: ARRAY(%d)", "stores", (int)r->num_stores);
ndr->depth++;
for (cntr_stores_1=0;cntr_stores_1<r->num_stores;cntr_stores_1++) {
char *idx_1=NULL;
@@ -1073,7 +1073,7 @@ _PUBLIC_ void ndr_print_dfs_Info6(struct ndr_print *ndr, const char *name, const
ndr_print_ptr(ndr, "stores", r->stores);
ndr->depth++;
if (r->stores) {
- ndr->print(ndr, "%s: ARRAY(%d)", "stores", r->num_stores);
+ ndr->print(ndr, "%s: ARRAY(%d)", "stores", (int)r->num_stores);
ndr->depth++;
for (cntr_stores_1=0;cntr_stores_1<r->num_stores;cntr_stores_1++) {
char *idx_1=NULL;
@@ -2264,7 +2264,7 @@ _PUBLIC_ void ndr_print_dfs_EnumArray1(struct ndr_print *ndr, const char *name,
ndr_print_ptr(ndr, "s", r->s);
ndr->depth++;
if (r->s) {
- ndr->print(ndr, "%s: ARRAY(%d)", "s", r->count);
+ ndr->print(ndr, "%s: ARRAY(%d)", "s", (int)r->count);
ndr->depth++;
for (cntr_s_1=0;cntr_s_1<r->count;cntr_s_1++) {
char *idx_1=NULL;
@@ -2350,7 +2350,7 @@ _PUBLIC_ void ndr_print_dfs_EnumArray2(struct ndr_print *ndr, const char *name,
ndr_print_ptr(ndr, "s", r->s);
ndr->depth++;
if (r->s) {
- ndr->print(ndr, "%s: ARRAY(%d)", "s", r->count);
+ ndr->print(ndr, "%s: ARRAY(%d)", "s", (int)r->count);
ndr->depth++;
for (cntr_s_1=0;cntr_s_1<r->count;cntr_s_1++) {
char *idx_1=NULL;
@@ -2436,7 +2436,7 @@ _PUBLIC_ void ndr_print_dfs_EnumArray3(struct ndr_print *ndr, const char *name,
ndr_print_ptr(ndr, "s", r->s);
ndr->depth++;
if (r->s) {
- ndr->print(ndr, "%s: ARRAY(%d)", "s", r->count);
+ ndr->print(ndr, "%s: ARRAY(%d)", "s", (int)r->count);
ndr->depth++;
for (cntr_s_1=0;cntr_s_1<r->count;cntr_s_1++) {
char *idx_1=NULL;
@@ -2522,7 +2522,7 @@ _PUBLIC_ void ndr_print_dfs_EnumArray4(struct ndr_print *ndr, const char *name,
ndr_print_ptr(ndr, "s", r->s);
ndr->depth++;
if (r->s) {
- ndr->print(ndr, "%s: ARRAY(%d)", "s", r->count);
+ ndr->print(ndr, "%s: ARRAY(%d)", "s", (int)r->count);
ndr->depth++;
for (cntr_s_1=0;cntr_s_1<r->count;cntr_s_1++) {
char *idx_1=NULL;
@@ -2608,7 +2608,7 @@ _PUBLIC_ void ndr_print_dfs_EnumArray5(struct ndr_print *ndr, const char *name,
ndr_print_ptr(ndr, "s", r->s);
ndr->depth++;
if (r->s) {
- ndr->print(ndr, "%s: ARRAY(%d)", "s", r->count);
+ ndr->print(ndr, "%s: ARRAY(%d)", "s", (int)r->count);
ndr->depth++;
for (cntr_s_1=0;cntr_s_1<r->count;cntr_s_1++) {
char *idx_1=NULL;
@@ -2694,7 +2694,7 @@ _PUBLIC_ void ndr_print_dfs_EnumArray6(struct ndr_print *ndr, const char *name,
ndr_print_ptr(ndr, "s", r->s);
ndr->depth++;
if (r->s) {
- ndr->print(ndr, "%s: ARRAY(%d)", "s", r->count);
+ ndr->print(ndr, "%s: ARRAY(%d)", "s", (int)r->count);
ndr->depth++;
for (cntr_s_1=0;cntr_s_1<r->count;cntr_s_1++) {
char *idx_1=NULL;
@@ -2780,7 +2780,7 @@ _PUBLIC_ void ndr_print_dfs_EnumArray200(struct ndr_print *ndr, const char *name
ndr_print_ptr(ndr, "s", r->s);
ndr->depth++;
if (r->s) {
- ndr->print(ndr, "%s: ARRAY(%d)", "s", r->count);
+ ndr->print(ndr, "%s: ARRAY(%d)", "s", (int)r->count);
ndr->depth++;
for (cntr_s_1=0;cntr_s_1<r->count;cntr_s_1++) {
char *idx_1=NULL;
@@ -2866,7 +2866,7 @@ _PUBLIC_ void ndr_print_dfs_EnumArray300(struct ndr_print *ndr, const char *name
ndr_print_ptr(ndr, "s", r->s);
ndr->depth++;
if (r->s) {
- ndr->print(ndr, "%s: ARRAY(%d)", "s", r->count);
+ ndr->print(ndr, "%s: ARRAY(%d)", "s", (int)r->count);
ndr->depth++;
for (cntr_s_1=0;cntr_s_1<r->count;cntr_s_1++) {
char *idx_1=NULL;
diff --git a/source/librpc/gen_ndr/ndr_echo.c b/source/librpc/gen_ndr/ndr_echo.c
index 83b5fa1..93a8464 100644
--- a/source/librpc/gen_ndr/ndr_echo.c
+++ b/source/librpc/gen_ndr/ndr_echo.c
@@ -623,7 +623,7 @@ _PUBLIC_ void ndr_print_echo_Surrounding(struct ndr_print *ndr, const char *name
ndr_print_struct(ndr, name, "echo_Surrounding");
ndr->depth++;
ndr_print_uint32(ndr, "x", r->x);
- ndr->print(ndr, "%s: ARRAY(%d)", "surrounding", r->x);
+ ndr->print(ndr, "%s: ARRAY(%d)", "surrounding", (int)r->x);
ndr->depth++;
for (cntr_surrounding_0=0;cntr_surrounding_0<r->x;cntr_surrounding_0++) {
char *idx_0=NULL;
diff --git a/source/librpc/gen_ndr/ndr_epmapper.c b/source/librpc/gen_ndr/ndr_epmapper.c
index ba2f7bd..ab84d28 100644
--- a/source/librpc/gen_ndr/ndr_epmapper.c
+++ b/source/librpc/gen_ndr/ndr_epmapper.c
@@ -1562,7 +1562,7 @@ _PUBLIC_ void ndr_print_epm_tower(struct ndr_print *ndr, const char *name, const
ndr_set_flags(&ndr->flags, LIBNDR_FLAG_NOALIGN|LIBNDR_FLAG_LITTLE_ENDIAN);
ndr->depth++;
ndr_print_uint16(ndr, "num_floors", r->num_floors);
- ndr->print(ndr, "%s: ARRAY(%d)", "floors", r->num_floors);
+ ndr->print(ndr, "%s: ARRAY(%d)", "floors", (int)r->num_floors);
ndr->depth++;
for (cntr_floors_0=0;cntr_floors_0<r->num_floors;cntr_floors_0++) {
char *idx_0=NULL;
@@ -1844,7 +1844,7 @@ _PUBLIC_ void ndr_print_epm_Insert(struct ndr_print *ndr, const char *name, int
ndr_print_struct(ndr, "in", "epm_Insert");
ndr->depth++;
ndr_print_uint32(ndr, "num_ents", r->in.num_ents);
- ndr->print(ndr, "%s: ARRAY(%d)", "entries", r->in.num_ents);
+ ndr->print(ndr, "%s: ARRAY(%d)", "entries", (int)r->in.num_ents);
ndr->depth++;
for (cntr_entries_0=0;cntr_entries_0<r->in.num_ents;cntr_entries_0++) {
char *idx_0=NULL;
@@ -1924,7 +1924,7 @@ _PUBLIC_ void ndr_print_epm_Delete(struct ndr_print *ndr, const char *name, int
ndr_print_struct(ndr, "in", "epm_Delete");
ndr->depth++;
ndr_print_uint32(ndr, "num_ents", r->in.num_ents);
- ndr->print(ndr, "%s: ARRAY(%d)", "entries", r->in.num_ents);
+ ndr->print(ndr, "%s: ARRAY(%d)", "entries", (int)r->in.num_ents);
ndr->depth++;
for (cntr_entries_0=0;cntr_entries_0<r->in.num_ents;cntr_entries_0++) {
char *idx_0=NULL;
@@ -2124,7 +2124,7 @@ _PUBLIC_ void ndr_print_epm_Lookup(struct ndr_print *ndr, const char *name, int
ndr->depth++;
ndr_print_uint32(ndr, "num_ents", *r->out.num_ents);
ndr->depth--;
- ndr->print(ndr, "%s: ARRAY(%d)", "entries", *r->out.num_ents);
+ ndr->print(ndr, "%s: ARRAY(%d)", "entries", (int)*r->out.num_ents);
ndr->depth++;
for (cntr_entries_0=0;cntr_entries_0<*r->out.num_ents;cntr_entries_0++) {
char *idx_0=NULL;
@@ -2313,7 +2313,7 @@ _PUBLIC_ void ndr_print_epm_Map(struct ndr_print *ndr, const char *name, int fla
ndr->depth++;
ndr_print_uint32(ndr, "num_towers", *r->out.num_towers);
ndr->depth--;
- ndr->print(ndr, "%s: ARRAY(%d)", "towers", *r->out.num_towers);
+ ndr->print(ndr, "%s: ARRAY(%d)", "towers", (int)*r->out.num_towers);
ndr->depth++;
for (cntr_towers_0=0;cntr_towers_0<*r->out.num_towers;cntr_towers_0++) {
char *idx_0=NULL;
diff --git a/source/librpc/gen_ndr/ndr_eventlog.c b/source/librpc/gen_ndr/ndr_eventlog.c
index c5461d9..2eb26c4 100644
--- a/source/librpc/gen_ndr/ndr_eventlog.c
+++ b/source/librpc/gen_ndr/ndr_eventlog.c
@@ -172,7 +172,7 @@ _PUBLIC_ void ndr_print_eventlog_Record(struct ndr_print *ndr, const char *name,
ndr_print_uint32(ndr, "data_offset", r->data_offset);
ndr_print_string(ndr, "source_name", r->source_name);
ndr_print_string(ndr, "computer_name", r->computer_name);
- ndr->print(ndr, "%s: ARRAY(%d)", "strings", r->num_of_strings);
+ ndr->print(ndr, "%s: ARRAY(%d)", "strings", (int)r->num_of_strings);
ndr->depth++;
for (cntr_strings_0=0;cntr_strings_0<r->num_of_strings;cntr_strings_0++) {
char *idx_0=NULL;
diff --git a/source/librpc/gen_ndr/ndr_krb5pac.c b/source/librpc/gen_ndr/ndr_krb5pac.c
index ef596e4..6e06f90 100644
--- a/source/librpc/gen_ndr/ndr_krb5pac.c
+++ b/source/librpc/gen_ndr/ndr_krb5pac.c
@@ -319,7 +319,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_PAC_INFO(struct ndr_push *ndr, int ndr_flags
NDR_CHECK(ndr_push_PAC_LOGON_NAME(ndr, NDR_SCALARS, &r->logon_name));
break; }
- case PAC_TYPE_UNKNOWN_12: {
+ default: {
{
struct ndr_push *_ndr_unknown;
NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_unknown, 0, -1));
@@ -328,8 +328,6 @@ _PUBLIC_ enum ndr_err_code ndr_push_PAC_INFO(struct ndr_push *ndr, int ndr_flags
}
break; }
- default:
- return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
}
}
if (ndr_flags & NDR_BUFFERS) {
@@ -348,11 +346,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_PAC_INFO(struct ndr_push *ndr, int ndr_flags
case PAC_TYPE_LOGON_NAME:
break;
- case PAC_TYPE_UNKNOWN_12:
+ default:
break;
- default:
- return ndr_push_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
}
}
return NDR_ERR_SUCCESS;
@@ -380,7 +376,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_PAC_INFO(struct ndr_pull *ndr, int ndr_flags
NDR_CHECK(ndr_pull_PAC_LOGON_NAME(ndr, NDR_SCALARS, &r->logon_name));
break; }
- case PAC_TYPE_UNKNOWN_12: {
+ default: {
{
struct ndr_pull *_ndr_unknown;
NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_unknown, 0, -1));
@@ -389,8 +385,6 @@ _PUBLIC_ enum ndr_err_code ndr_pull_PAC_INFO(struct ndr_pull *ndr, int ndr_flags
}
break; }
- default:
- return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
}
}
if (ndr_flags & NDR_BUFFERS) {
@@ -408,11 +402,9 @@ _PUBLIC_ enum ndr_err_code ndr_pull_PAC_INFO(struct ndr_pull *ndr, int ndr_flags
case PAC_TYPE_LOGON_NAME:
break;
- case PAC_TYPE_UNKNOWN_12:
+ default:
break;
- default:
- return ndr_pull_error(ndr, NDR_ERR_BAD_SWITCH, "Bad switch value %u", level);
}
}
return NDR_ERR_SUCCESS;
@@ -440,12 +432,10 @@ _PUBLIC_ void ndr_print_PAC_INFO(struct ndr_print *ndr, const char *name, const
ndr_print_PAC_LOGON_NAME(ndr, "logon_name", &r->logon_name);
break;
- case PAC_TYPE_UNKNOWN_12:
+ default:
ndr_print_DATA_BLOB_REM(ndr, "unknown", &r->unknown);
break;
- default:
- ndr_print_bad_level(ndr, name, level);
}
}
@@ -507,7 +497,7 @@ _PUBLIC_ void ndr_print_PAC_DATA(struct ndr_print *ndr, const char *name, const
ndr->depth++;
ndr_print_uint32(ndr, "num_buffers", r->num_buffers);
ndr_print_uint32(ndr, "version", r->version);
- ndr->print(ndr, "%s: ARRAY(%d)", "buffers", r->num_buffers);
+ ndr->print(ndr, "%s: ARRAY(%d)", "buffers", (int)r->num_buffers);
ndr->depth++;
for (cntr_buffers_0=0;cntr_buffers_0<r->num_buffers;cntr_buffers_0++) {
char *idx_0=NULL;
@@ -669,7 +659,7 @@ _PUBLIC_ void ndr_print_PAC_DATA_RAW(struct ndr_print *ndr, const char *name, co
ndr->depth++;
ndr_print_uint32(ndr, "num_buffers", r->num_buffers);
ndr_print_uint32(ndr, "version", r->version);
- ndr->print(ndr, "%s: ARRAY(%d)", "buffers", r->num_buffers);
+ ndr->print(ndr, "%s: ARRAY(%d)", "buffers", (int)r->num_buffers);
ndr->depth++;
for (cntr_buffers_0=0;cntr_buffers_0<r->num_buffers;cntr_buffers_0++) {
char *idx_0=NULL;
diff --git a/source/librpc/gen_ndr/ndr_lsa.c b/source/librpc/gen_ndr/ndr_lsa.c
index c7d428b..f25410a 100644
--- a/source/librpc/gen_ndr/ndr_lsa.c
+++ b/source/librpc/gen_ndr/ndr_lsa.c
@@ -217,7 +217,7 @@ _PUBLIC_ void ndr_print_lsa_Strings(struct ndr_print *ndr, const char *name, con
ndr_print_ptr(ndr, "names", r->names);
ndr->depth++;
if (r->names) {
- ndr->print(ndr, "%s: ARRAY(%d)", "names", r->count);
+ ndr->print(ndr, "%s: ARRAY(%d)", "names", (int)r->count);
ndr->depth++;
for (cntr_names_1=0;cntr_names_1<r->count;cntr_names_1++) {
char *idx_1=NULL;
@@ -451,7 +451,7 @@ _PUBLIC_ void ndr_print_lsa_BinaryString(struct ndr_print *ndr, const char *name
ndr_print_ptr(ndr, "array", r->array);
ndr->depth++;
if (r->array) {
- ndr->print(ndr, "%s: ARRAY(%d)", "array", r->length / 2);
+ ndr->print(ndr, "%s: ARRAY(%d)", "array", (int)r->length / 2);
ndr->depth++;
for (cntr_array_1=0;cntr_array_1<r->length / 2;cntr_array_1++) {
char *idx_1=NULL;
@@ -605,7 +605,7 @@ _PUBLIC_ void ndr_print_lsa_PrivArray(struct ndr_print *ndr, const char *name, c
ndr_print_ptr(ndr, "privs", r->privs);
ndr->depth++;
if (r->privs) {
- ndr->print(ndr, "%s: ARRAY(%d)", "privs", r->count);
+ ndr->print(ndr, "%s: ARRAY(%d)", "privs", (int)r->count);
ndr->depth++;
for (cntr_privs_1=0;cntr_privs_1<r->count;cntr_privs_1++) {
char *idx_1=NULL;
@@ -973,7 +973,7 @@ _PUBLIC_ void ndr_print_lsa_AuditEventsInfo(struct ndr_print *ndr, const char *n
ndr_print_ptr(ndr, "settings", r->settings);
ndr->depth++;
if (r->settings) {
- ndr->print(ndr, "%s: ARRAY(%d)", "settings", r->count);
+ ndr->print(ndr, "%s: ARRAY(%d)", "settings", (int)r->count);
ndr->depth++;
for (cntr_settings_1=0;cntr_settings_1<r->count;cntr_settings_1++) {
char *idx_1=NULL;
@@ -1805,7 +1805,7 @@ _PUBLIC_ void ndr_print_lsa_SidArray(struct ndr_print *ndr, const char *name, co
ndr_print_ptr(ndr, "sids", r->sids);
ndr->depth++;
if (r->sids) {
- ndr->print(ndr, "%s: ARRAY(%d)", "sids", r->num_sids);
+ ndr->print(ndr, "%s: ARRAY(%d)", "sids", (int)r->num_sids);
ndr->depth++;
for (cntr_sids_1=0;cntr_sids_1<r->num_sids;cntr_sids_1++) {
char *idx_1=NULL;
@@ -1891,7 +1891,7 @@ _PUBLIC_ void ndr_print_lsa_DomainList(struct ndr_print *ndr, const char *name,
ndr_print_ptr(ndr, "domains", r->domains);
ndr->depth++;
if (r->domains) {
- ndr->print(ndr, "%s: ARRAY(%d)", "domains", r->count);
+ ndr->print(ndr, "%s: ARRAY(%d)", "domains", (int)r->count);
ndr->depth++;
for (cntr_domains_1=0;cntr_domains_1<r->count;cntr_domains_1++) {
char *idx_1=NULL;
@@ -2043,7 +2043,7 @@ _PUBLIC_ void ndr_print_lsa_TransSidArray(struct ndr_print *ndr, const char *nam
ndr_print_ptr(ndr, "sids", r->sids);
ndr->depth++;
if (r->sids) {
- ndr->print(ndr, "%s: ARRAY(%d)", "sids", r->count);
+ ndr->print(ndr, "%s: ARRAY(%d)", "sids", (int)r->count);
ndr->depth++;
for (cntr_sids_1=0;cntr_sids_1<r->count;cntr_sids_1++) {
char *idx_1=NULL;
@@ -2134,7 +2134,7 @@ _PUBLIC_ void ndr_print_lsa_RefDomainList(struct ndr_print *ndr, const char *nam
ndr_print_ptr(ndr, "domains", r->domains);
ndr->depth++;
if (r->domains) {
- ndr->print(ndr, "%s: ARRAY(%d)", "domains", r->count);
+ ndr->print(ndr, "%s: ARRAY(%d)", "domains", (int)r->count);
ndr->depth++;
for (cntr_domains_1=0;cntr_domains_1<r->count;cntr_domains_1++) {
char *idx_1=NULL;
@@ -2291,7 +2291,7 @@ _PUBLIC_ void ndr_print_lsa_TransNameArray(struct ndr_print *ndr, const char *na
ndr_print_ptr(ndr, "names", r->names);
ndr->depth++;
if (r->names) {
- ndr->print(ndr, "%s: ARRAY(%d)", "names", r->count);
+ ndr->print(ndr, "%s: ARRAY(%d)", "names", (int)r->count);
ndr->depth++;
for (cntr_names_1=0;cntr_names_1<r->count;cntr_names_1++) {
char *idx_1=NULL;
@@ -2391,7 +2391,7 @@ _PUBLIC_ void ndr_print_lsa_PrivilegeSet(struct ndr_print *ndr, const char *name
ndr->depth++;
ndr_print_uint32(ndr, "count", r->count);
ndr_print_uint32(ndr, "unknown", r->unknown);
- ndr->print(ndr, "%s: ARRAY(%d)", "set", r->count);
+ ndr->print(ndr, "%s: ARRAY(%d)", "set", (int)r->count);
ndr->depth++;
for (cntr_set_0=0;cntr_set_0<r->count;cntr_set_0++) {
char *idx_0=NULL;
@@ -3512,7 +3512,7 @@ _PUBLIC_ void ndr_print_lsa_RightSet(struct ndr_print *ndr, const char *name, co
ndr_print_ptr(ndr, "names", r->names);
ndr->depth++;
if (r->names) {
- ndr->print(ndr, "%s: ARRAY(%d)", "names", r->count);
+ ndr->print(ndr, "%s: ARRAY(%d)", "names", (int)r->count);
ndr->depth++;
for (cntr_names_1=0;cntr_names_1<r->count;cntr_names_1++) {
char *idx_1=NULL;
@@ -3598,7 +3598,7 @@ _PUBLIC_ void ndr_print_lsa_DomainListEx(struct ndr_print *ndr, const char *name
ndr_print_ptr(ndr, "domains", r->domains);
ndr->depth++;
if (r->domains) {
- ndr->print(ndr, "%s: ARRAY(%d)", "domains", r->count);
+ ndr->print(ndr, "%s: ARRAY(%d)", "domains", (int)r->count);
ndr->depth++;
for (cntr_domains_1=0;cntr_domains_1<r->count;cntr_domains_1++) {
char *idx_1=NULL;
@@ -3926,7 +3926,7 @@ _PUBLIC_ void ndr_print_lsa_TransNameArray2(struct ndr_print *ndr, const char *n
ndr_print_ptr(ndr, "names", r->names);
ndr->depth++;
if (r->names) {
- ndr->print(ndr, "%s: ARRAY(%d)", "names", r->count);
+ ndr->print(ndr, "%s: ARRAY(%d)", "names", (int)r->count);
ndr->depth++;
for (cntr_names_1=0;cntr_names_1<r->count;cntr_names_1++) {
char *idx_1=NULL;
--
Samba Shared Repository
More information about the samba-cvs
mailing list