svn commit: samba r17626 - in branches/SAMBA_3_0/source: auth
libads nmbd
vlendec at samba.org
vlendec at samba.org
Sun Aug 20 17:55:09 GMT 2006
Author: vlendec
Date: 2006-08-20 17:55:06 +0000 (Sun, 20 Aug 2006)
New Revision: 17626
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17626
Log:
Some C++ Warnings
Modified:
branches/SAMBA_3_0/source/auth/auth_ntlmssp.c
branches/SAMBA_3_0/source/auth/auth_winbind.c
branches/SAMBA_3_0/source/libads/ads_struct.c
branches/SAMBA_3_0/source/libads/krb5_setpw.c
branches/SAMBA_3_0/source/nmbd/nmbd_winsserver.c
Changeset:
Modified: branches/SAMBA_3_0/source/auth/auth_ntlmssp.c
===================================================================
--- branches/SAMBA_3_0/source/auth/auth_ntlmssp.c 2006-08-20 17:46:20 UTC (rev 17625)
+++ branches/SAMBA_3_0/source/auth/auth_ntlmssp.c 2006-08-20 17:55:06 UTC (rev 17626)
@@ -30,7 +30,8 @@
static const uint8 *auth_ntlmssp_get_challenge(const struct ntlmssp_state *ntlmssp_state)
{
- AUTH_NTLMSSP_STATE *auth_ntlmssp_state = ntlmssp_state->auth_context;
+ AUTH_NTLMSSP_STATE *auth_ntlmssp_state =
+ (AUTH_NTLMSSP_STATE *)ntlmssp_state->auth_context;
return auth_ntlmssp_state->auth_context->get_ntlm_challenge(auth_ntlmssp_state->auth_context);
}
@@ -41,7 +42,8 @@
*/
static BOOL auth_ntlmssp_may_set_challenge(const struct ntlmssp_state *ntlmssp_state)
{
- AUTH_NTLMSSP_STATE *auth_ntlmssp_state = ntlmssp_state->auth_context;
+ AUTH_NTLMSSP_STATE *auth_ntlmssp_state =
+ (AUTH_NTLMSSP_STATE *)ntlmssp_state->auth_context;
struct auth_context *auth_context = auth_ntlmssp_state->auth_context;
return auth_context->challenge_may_be_modified;
@@ -53,7 +55,8 @@
*/
static NTSTATUS auth_ntlmssp_set_challenge(struct ntlmssp_state *ntlmssp_state, DATA_BLOB *challenge)
{
- AUTH_NTLMSSP_STATE *auth_ntlmssp_state = ntlmssp_state->auth_context;
+ AUTH_NTLMSSP_STATE *auth_ntlmssp_state =
+ (AUTH_NTLMSSP_STATE *)ntlmssp_state->auth_context;
struct auth_context *auth_context = auth_ntlmssp_state->auth_context;
SMB_ASSERT(challenge->length == 8);
@@ -77,7 +80,8 @@
static NTSTATUS auth_ntlmssp_check_password(struct ntlmssp_state *ntlmssp_state, DATA_BLOB *user_session_key, DATA_BLOB *lm_session_key)
{
- AUTH_NTLMSSP_STATE *auth_ntlmssp_state = ntlmssp_state->auth_context;
+ AUTH_NTLMSSP_STATE *auth_ntlmssp_state =
+ (AUTH_NTLMSSP_STATE *)ntlmssp_state->auth_context;
auth_usersupplied_info *user_info = NULL;
NTSTATUS nt_status;
BOOL username_was_mapped;
Modified: branches/SAMBA_3_0/source/auth/auth_winbind.c
===================================================================
--- branches/SAMBA_3_0/source/auth/auth_winbind.c 2006-08-20 17:46:20 UTC (rev 17625)
+++ branches/SAMBA_3_0/source/auth/auth_winbind.c 2006-08-20 17:55:06 UTC (rev 17626)
@@ -32,7 +32,7 @@
size_t len = response->length - sizeof(struct winbindd_response);
prs_struct ps;
if (len > 0) {
- info3_ndr = response->extra_data.data;
+ info3_ndr = (uint8 *)response->extra_data.data;
if (!prs_init(&ps, len, mem_ctx, UNMARSHALL)) {
return NT_STATUS_NO_MEMORY;
}
@@ -112,7 +112,8 @@
unbecome_root();
if ( result == NSS_STATUS_UNAVAIL ) {
- struct auth_methods *auth_method = my_private_data;
+ struct auth_methods *auth_method =
+ (struct auth_methods *)my_private_data;
if ( auth_method )
return auth_method->auth(auth_context, auth_method->private_data,
Modified: branches/SAMBA_3_0/source/libads/ads_struct.c
===================================================================
--- branches/SAMBA_3_0/source/libads/ads_struct.c 2006-08-20 17:46:20 UTC (rev 17625)
+++ branches/SAMBA_3_0/source/libads/ads_struct.c 2006-08-20 17:55:06 UTC (rev 17626)
@@ -42,7 +42,7 @@
len = (numbits+1)*(strlen(field)+1) + strlen(r) + 1;
- ret = SMB_MALLOC(len);
+ ret = (char *)SMB_MALLOC(len);
if (!ret)
return NULL;
Modified: branches/SAMBA_3_0/source/libads/krb5_setpw.c
===================================================================
--- branches/SAMBA_3_0/source/libads/krb5_setpw.c 2006-08-20 17:46:20 UTC (rev 17625)
+++ branches/SAMBA_3_0/source/libads/krb5_setpw.c 2006-08-20 17:55:06 UTC (rev 17626)
@@ -667,7 +667,9 @@
memset(prompts[0].reply->data, 0, prompts[0].reply->length);
if (prompts[0].reply->length > 0) {
if (data) {
- strncpy(prompts[0].reply->data, data, prompts[0].reply->length-1);
+ strncpy(prompts[0].reply->data,
+ (const char *)data,
+ prompts[0].reply->length-1);
prompts[0].reply->length = strlen(prompts[0].reply->data);
} else {
prompts[0].reply->length = 0;
Modified: branches/SAMBA_3_0/source/nmbd/nmbd_winsserver.c
===================================================================
--- branches/SAMBA_3_0/source/nmbd/nmbd_winsserver.c 2006-08-20 17:46:20 UTC (rev 17625)
+++ branches/SAMBA_3_0/source/nmbd/nmbd_winsserver.c 2006-08-20 17:55:06 UTC (rev 17626)
@@ -159,7 +159,7 @@
len = (2 + 1 + (7*4)); /* "wbddddddd" */
len += (namerec->data.num_ips * 4);
- data.dptr = SMB_MALLOC(len);
+ data.dptr = (char *)SMB_MALLOC(len);
if (!data.dptr) {
return data;
}
More information about the samba-cvs
mailing list