[SCM] Samba Shared Repository - branch master updated
Volker Lendecke
vlendec at samba.org
Mon Jun 21 07:04:39 MDT 2010
The branch, master has been updated
via e9e80a3... tldap: Fix a type-punned warning
via 4b64555... tsocket: Fix some type-punned warnings
via 8af446b... s3: Fix some enum/int mixup warnings
via dee72d8... s3: Remove an unreachable line of code
via c0ed0bc... s3: Fix a type-punned warning
from b784c20... s3:net rpc registry: make getsd succeed when key sd only gives access to SD not key contents
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e9e80a36e461a0d07cdc9d1be27e60624133b096
Author: Volker Lendecke <vl at samba.org>
Date: Mon Jun 21 08:47:38 2010 +0200
tldap: Fix a type-punned warning
commit 4b64555d759c85d8ce471a28f9a4b9210fae59d5
Author: Volker Lendecke <vl at samba.org>
Date: Mon Jun 21 08:42:58 2010 +0200
tsocket: Fix some type-punned warnings
commit 8af446be78211a3471af60ef0173cdda3e6f61bc
Author: Volker Lendecke <vl at samba.org>
Date: Mon Jun 21 08:41:56 2010 +0200
s3: Fix some enum/int mixup warnings
commit dee72d807f8e2f5fef83dbd409554eddefc9bd6f
Author: Volker Lendecke <vl at samba.org>
Date: Mon Jun 21 08:39:54 2010 +0200
s3: Remove an unreachable line of code
commit c0ed0bca59dc1dc0c614641c2e54933fbc4f64da
Author: Volker Lendecke <vl at samba.org>
Date: Mon Jun 21 08:38:51 2010 +0200
s3: Fix a type-punned warning
-----------------------------------------------------------------------
Summary of changes:
lib/tsocket/tsocket_bsd.c | 4 +-
source3/lib/netapi/libnetapi.c | 106 ++++++++++++++++++++--------------------
source3/lib/tldap.c | 2 +-
source3/lib/util_tsock.c | 4 +-
source3/rpc_client/cli_pipe.c | 2 -
5 files changed, 58 insertions(+), 60 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/tsocket/tsocket_bsd.c b/lib/tsocket/tsocket_bsd.c
index 4a8a63e..dfc9685 100644
--- a/lib/tsocket/tsocket_bsd.c
+++ b/lib/tsocket/tsocket_bsd.c
@@ -1663,7 +1663,7 @@ static void tstream_bsd_readv_handler(void *private_data)
uint8_t *base;
base = (uint8_t *)state->vector[0].iov_base;
base += ret;
- state->vector[0].iov_base = base;
+ state->vector[0].iov_base = (void *)base;
state->vector[0].iov_len -= ret;
break;
}
@@ -1823,7 +1823,7 @@ static void tstream_bsd_writev_handler(void *private_data)
uint8_t *base;
base = (uint8_t *)state->vector[0].iov_base;
base += ret;
- state->vector[0].iov_base = base;
+ state->vector[0].iov_base = (void *)base;
state->vector[0].iov_len -= ret;
break;
}
diff --git a/source3/lib/netapi/libnetapi.c b/source3/lib/netapi/libnetapi.c
index 336ab26..c50f372 100644
--- a/source3/lib/netapi/libnetapi.c
+++ b/source3/lib/netapi/libnetapi.c
@@ -71,7 +71,7 @@ NET_API_STATUS NetJoinDomain(const char * server /* [in] [unique] */,
NDR_PRINT_OUT_DEBUG(NetJoinDomain, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -117,7 +117,7 @@ NET_API_STATUS NetUnjoinDomain(const char * server_name /* [in] [unique] */,
NDR_PRINT_OUT_DEBUG(NetUnjoinDomain, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -161,7 +161,7 @@ NET_API_STATUS NetGetJoinInformation(const char * server_name /* [in] [unique] *
NDR_PRINT_OUT_DEBUG(NetGetJoinInformation, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -211,7 +211,7 @@ NET_API_STATUS NetGetJoinableOUs(const char * server_name /* [in] [unique] */,
NDR_PRINT_OUT_DEBUG(NetGetJoinableOUs, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -259,7 +259,7 @@ NET_API_STATUS NetRenameMachineInDomain(const char * server_name /* [in] */,
NDR_PRINT_OUT_DEBUG(NetRenameMachineInDomain, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -303,7 +303,7 @@ NET_API_STATUS NetServerGetInfo(const char * server_name /* [in] [unique] */,
NDR_PRINT_OUT_DEBUG(NetServerGetInfo, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -349,7 +349,7 @@ NET_API_STATUS NetServerSetInfo(const char * server_name /* [in] [unique] */,
NDR_PRINT_OUT_DEBUG(NetServerSetInfo, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -393,7 +393,7 @@ NET_API_STATUS NetGetDCName(const char * server_name /* [in] [unique] */,
NDR_PRINT_OUT_DEBUG(NetGetDCName, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -437,7 +437,7 @@ NET_API_STATUS NetGetAnyDCName(const char * server_name /* [in] [unique] */,
NDR_PRINT_OUT_DEBUG(NetGetAnyDCName, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -487,7 +487,7 @@ NET_API_STATUS DsGetDcName(const char * server_name /* [in] [unique] */,
NDR_PRINT_OUT_DEBUG(DsGetDcName, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -533,7 +533,7 @@ NET_API_STATUS NetUserAdd(const char * server_name /* [in] [unique] */,
NDR_PRINT_OUT_DEBUG(NetUserAdd, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -575,7 +575,7 @@ NET_API_STATUS NetUserDel(const char * server_name /* [in] [unique] */,
NDR_PRINT_OUT_DEBUG(NetUserDel, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -630,7 +630,7 @@ NET_API_STATUS NetUserEnum(const char * server_name /* [in] [unique] */,
NDR_PRINT_OUT_DEBUG(NetUserEnum, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -676,7 +676,7 @@ NET_API_STATUS NetUserChangePassword(const char * domain_name /* [in] */,
NDR_PRINT_OUT_DEBUG(NetUserChangePassword, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -722,7 +722,7 @@ NET_API_STATUS NetUserGetInfo(const char * server_name /* [in] */,
NDR_PRINT_OUT_DEBUG(NetUserGetInfo, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -770,7 +770,7 @@ NET_API_STATUS NetUserSetInfo(const char * server_name /* [in] */,
NDR_PRINT_OUT_DEBUG(NetUserSetInfo, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -822,7 +822,7 @@ NET_API_STATUS NetUserGetGroups(const char * server_name /* [in] */,
NDR_PRINT_OUT_DEBUG(NetUserGetGroups, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -870,7 +870,7 @@ NET_API_STATUS NetUserSetGroups(const char * server_name /* [in] */,
NDR_PRINT_OUT_DEBUG(NetUserSetGroups, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -924,7 +924,7 @@ NET_API_STATUS NetUserGetLocalGroups(const char * server_name /* [in] */,
NDR_PRINT_OUT_DEBUG(NetUserGetLocalGroups, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -968,7 +968,7 @@ NET_API_STATUS NetUserModalsGet(const char * server_name /* [in] */,
NDR_PRINT_OUT_DEBUG(NetUserModalsGet, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -1014,7 +1014,7 @@ NET_API_STATUS NetUserModalsSet(const char * server_name /* [in] */,
NDR_PRINT_OUT_DEBUG(NetUserModalsSet, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -1066,7 +1066,7 @@ NET_API_STATUS NetQueryDisplayInformation(const char * server_name /* [in] [uniq
NDR_PRINT_OUT_DEBUG(NetQueryDisplayInformation, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -1112,7 +1112,7 @@ NET_API_STATUS NetGroupAdd(const char * server_name /* [in] */,
NDR_PRINT_OUT_DEBUG(NetGroupAdd, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -1154,7 +1154,7 @@ NET_API_STATUS NetGroupDel(const char * server_name /* [in] */,
NDR_PRINT_OUT_DEBUG(NetGroupDel, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -1207,7 +1207,7 @@ NET_API_STATUS NetGroupEnum(const char * server_name /* [in] */,
NDR_PRINT_OUT_DEBUG(NetGroupEnum, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -1255,7 +1255,7 @@ NET_API_STATUS NetGroupSetInfo(const char * server_name /* [in] */,
NDR_PRINT_OUT_DEBUG(NetGroupSetInfo, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -1301,7 +1301,7 @@ NET_API_STATUS NetGroupGetInfo(const char * server_name /* [in] */,
NDR_PRINT_OUT_DEBUG(NetGroupGetInfo, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -1345,7 +1345,7 @@ NET_API_STATUS NetGroupAddUser(const char * server_name /* [in] */,
NDR_PRINT_OUT_DEBUG(NetGroupAddUser, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -1389,7 +1389,7 @@ NET_API_STATUS NetGroupDelUser(const char * server_name /* [in] */,
NDR_PRINT_OUT_DEBUG(NetGroupDelUser, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -1444,7 +1444,7 @@ NET_API_STATUS NetGroupGetUsers(const char * server_name /* [in] */,
NDR_PRINT_OUT_DEBUG(NetGroupGetUsers, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -1492,7 +1492,7 @@ NET_API_STATUS NetGroupSetUsers(const char * server_name /* [in] */,
NDR_PRINT_OUT_DEBUG(NetGroupSetUsers, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -1538,7 +1538,7 @@ NET_API_STATUS NetLocalGroupAdd(const char * server_name /* [in] */,
NDR_PRINT_OUT_DEBUG(NetLocalGroupAdd, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -1580,7 +1580,7 @@ NET_API_STATUS NetLocalGroupDel(const char * server_name /* [in] */,
NDR_PRINT_OUT_DEBUG(NetLocalGroupDel, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -1626,7 +1626,7 @@ NET_API_STATUS NetLocalGroupGetInfo(const char * server_name /* [in] */,
NDR_PRINT_OUT_DEBUG(NetLocalGroupGetInfo, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -1674,7 +1674,7 @@ NET_API_STATUS NetLocalGroupSetInfo(const char * server_name /* [in] */,
NDR_PRINT_OUT_DEBUG(NetLocalGroupSetInfo, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -1727,7 +1727,7 @@ NET_API_STATUS NetLocalGroupEnum(const char * server_name /* [in] */,
NDR_PRINT_OUT_DEBUG(NetLocalGroupEnum, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -1775,7 +1775,7 @@ NET_API_STATUS NetLocalGroupAddMembers(const char * server_name /* [in] */,
NDR_PRINT_OUT_DEBUG(NetLocalGroupAddMembers, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -1823,7 +1823,7 @@ NET_API_STATUS NetLocalGroupDelMembers(const char * server_name /* [in] */,
NDR_PRINT_OUT_DEBUG(NetLocalGroupDelMembers, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -1878,7 +1878,7 @@ NET_API_STATUS NetLocalGroupGetMembers(const char * server_name /* [in] */,
NDR_PRINT_OUT_DEBUG(NetLocalGroupGetMembers, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -1926,7 +1926,7 @@ NET_API_STATUS NetLocalGroupSetMembers(const char * server_name /* [in] */,
NDR_PRINT_OUT_DEBUG(NetLocalGroupSetMembers, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -1968,7 +1968,7 @@ NET_API_STATUS NetRemoteTOD(const char * server_name /* [in] */,
NDR_PRINT_OUT_DEBUG(NetRemoteTOD, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -2014,7 +2014,7 @@ NET_API_STATUS NetShareAdd(const char * server_name /* [in] */,
NDR_PRINT_OUT_DEBUG(NetShareAdd, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -2058,7 +2058,7 @@ NET_API_STATUS NetShareDel(const char * server_name /* [in] */,
NDR_PRINT_OUT_DEBUG(NetShareDel, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -2111,7 +2111,7 @@ NET_API_STATUS NetShareEnum(const char * server_name /* [in] */,
NDR_PRINT_OUT_DEBUG(NetShareEnum, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -2157,7 +2157,7 @@ NET_API_STATUS NetShareGetInfo(const char * server_name /* [in] */,
NDR_PRINT_OUT_DEBUG(NetShareGetInfo, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -2205,7 +2205,7 @@ NET_API_STATUS NetShareSetInfo(const char * server_name /* [in] */,
NDR_PRINT_OUT_DEBUG(NetShareSetInfo, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -2247,7 +2247,7 @@ NET_API_STATUS NetFileClose(const char * server_name /* [in] */,
NDR_PRINT_OUT_DEBUG(NetFileClose, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -2293,7 +2293,7 @@ NET_API_STATUS NetFileGetInfo(const char * server_name /* [in] */,
NDR_PRINT_OUT_DEBUG(NetFileGetInfo, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -2350,7 +2350,7 @@ NET_API_STATUS NetFileEnum(const char * server_name /* [in] */,
NDR_PRINT_OUT_DEBUG(NetFileEnum, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -2398,7 +2398,7 @@ NET_API_STATUS NetShutdownInit(const char * server_name /* [in] */,
NDR_PRINT_OUT_DEBUG(NetShutdownInit, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -2438,7 +2438,7 @@ NET_API_STATUS NetShutdownAbort(const char * server_name /* [in] */)
NDR_PRINT_OUT_DEBUG(NetShutdownAbort, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -2484,7 +2484,7 @@ NET_API_STATUS I_NetLogonControl(const char * server_name /* [in] */,
NDR_PRINT_OUT_DEBUG(I_NetLogonControl, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
}
/****************************************************************
@@ -2532,6 +2532,6 @@ NET_API_STATUS I_NetLogonControl2(const char * server_name /* [in] */,
NDR_PRINT_OUT_DEBUG(I_NetLogonControl2, &r);
}
- return r.out.result;
+ return (NET_API_STATUS)r.out.result;
--
Samba Shared Repository
More information about the samba-cvs
mailing list