sync 3.0 into HEAD for the last time

[vlendec/samba-autobuild/.git] / source3 / auth / auth.c

diff --git a/source3/auth/auth.c b/source3/auth/auth.c
index 8316c4b61798607e9aaf1a6f33f1d6abaa5d64e3..553d9a686e31b82a6d52b4c5088d1aa67bd12d01 100644 (file)
--- a/source3/auth/auth.c
+++ b/source3/auth/auth.c
@@ -131,7 +131,7 @@ static const uint8 *get_ntlm_challenge(struct auth_context *auth_context)
        
        DEBUG(5, ("auth_context challenge created by %s\n", challenge_set_by));
        DEBUG(5, ("challenge is: \n"));
-       dump_data(5, auth_context->challenge.data, auth_context->challenge.length);
+       dump_data(5, (const char *)auth_context->challenge.data, auth_context->challenge.length);
        
        SMB_ASSERT(auth_context->challenge.length == 8);
 
@@ -228,7 +228,7 @@ static NTSTATUS check_ntlm_password(const struct auth_context *auth_context,
                                        auth_context->challenge_set_by));
 
        DEBUG(10, ("challenge is: \n"));
-       dump_data(5, auth_context->challenge.data, auth_context->challenge.length);
+       dump_data(5, (const char *)auth_context->challenge.data, auth_context->challenge.length);
 
 #ifdef DEBUG_PASSWORD
        DEBUG(100, ("user_info has passwords of length %d and %d\n", 
@@ -373,10 +373,10 @@ BOOL load_auth_module(struct auth_context *auth_context,
        if (p) {
                *p = 0;
                module_params = p+1;
-               trim_string(module_params, " ", " ");
+               trim_char(module_params, ' ', ' ');
        }
        
-       trim_string(module_name, " ", " ");
+       trim_char(module_name, ' ', ' ');
        
        entry = auth_find_backend_entry(module_name);