diff options
| -rw-r--r-- | source/client/client.c | 2 | ||||
| -rw-r--r-- | source/lib/charcnv.c | 4 | ||||
| -rw-r--r-- | source/libads/krb5_setpw.c | 2 | ||||
| -rw-r--r-- | source/libsmb/cliconnect.c | 4 | ||||
| -rw-r--r-- | source/libsmb/clikrb5.c | 2 | ||||
| -rw-r--r-- | source/smbd/sesssetup.c | 4 | ||||
| -rw-r--r-- | source/utils/net_join.c | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/source/client/client.c b/source/client/client.c index c3d1fbc7ecc..c1b4ade011d 100644 --- a/source/client/client.c +++ b/source/client/client.c @@ -2686,7 +2686,7 @@ static int do_message_op(void) io_bufsize = MAX(1, atoi(optarg)); break; case 'k': -#if HAVE_KRB5 +#ifdef HAVE_KRB5 use_kerberos = True; got_pass = True; #else diff --git a/source/lib/charcnv.c b/source/lib/charcnv.c index ab9554f8486..2e5413c5c0b 100644 --- a/source/lib/charcnv.c +++ b/source/lib/charcnv.c @@ -95,7 +95,7 @@ size_t convert_string(charset_t from, charset_t to, { size_t i_len, o_len; size_t retval; - const char* inbuf = (char*)src; + const char* inbuf = (const char*)src; char* outbuf = (char*)dest; smb_iconv_t descriptor; @@ -155,7 +155,7 @@ size_t convert_string_allocate(charset_t from, charset_t to, { size_t i_len, o_len, destlen; size_t retval; - const char *inbuf = (char *)src; + const char *inbuf = (const char *)src; char *outbuf, *ob; smb_iconv_t descriptor; diff --git a/source/libads/krb5_setpw.c b/source/libads/krb5_setpw.c index 5cb3de1bb58..1c3b15d2a57 100644 --- a/source/libads/krb5_setpw.c +++ b/source/libads/krb5_setpw.c @@ -21,7 +21,7 @@ #include "includes.h" -#if HAVE_KRB5 +#ifdef HAVE_KRB5 #define DEFAULT_KPASSWD_PORT 464 #define KRB5_KPASSWD_VERS_CHANGEPW 1 diff --git a/source/libsmb/cliconnect.c b/source/libsmb/cliconnect.c index 0fceac70e2a..cfbb6d62228 100644 --- a/source/libsmb/cliconnect.c +++ b/source/libsmb/cliconnect.c @@ -378,7 +378,7 @@ static DATA_BLOB cli_session_setup_blob(struct cli_state *cli, DATA_BLOB blob) } -#if HAVE_KRB5 +#ifdef HAVE_KRB5 /**************************************************************************** do a spnego/kerberos encrypted session setup ****************************************************************************/ @@ -543,7 +543,7 @@ static BOOL cli_session_setup_spnego(struct cli_state *cli, char *user, fstrcpy(cli->user_name, user); -#if HAVE_KRB5 +#ifdef HAVE_KRB5 if (got_kerberos_mechanism && cli->use_kerberos) { return cli_session_setup_kerberos(cli, principal, workgroup); } diff --git a/source/libsmb/clikrb5.c b/source/libsmb/clikrb5.c index 37b92b8d99f..03fb6a56690 100644 --- a/source/libsmb/clikrb5.c +++ b/source/libsmb/clikrb5.c @@ -21,7 +21,7 @@ #include "includes.h" -#if HAVE_KRB5 +#ifdef HAVE_KRB5 /* we can't use krb5_mk_req because w2k wants the service to be in a particular format */ diff --git a/source/smbd/sesssetup.c b/source/smbd/sesssetup.c index f9d52e9be40..863a5090423 100644 --- a/source/smbd/sesssetup.c +++ b/source/smbd/sesssetup.c @@ -64,7 +64,7 @@ static NTSTATUS check_guest_password(auth_serversupplied_info **server_info) } -#if HAVE_KRB5 +#ifdef HAVE_KRB5 /**************************************************************************** reply to a session setup spnego negotiate packet for kerberos ****************************************************************************/ @@ -201,7 +201,7 @@ static int reply_spnego_negotiate(connection_struct *conn, } DEBUG(3,("Got secblob of size %d\n", secblob.length)); -#if HAVE_KRB5 +#ifdef HAVE_KRB5 if (got_kerberos) { int ret = reply_spnego_kerberos(conn, inbuf, outbuf, length, bufsize, &secblob); diff --git a/source/utils/net_join.c b/source/utils/net_join.c index 793d72ac7ee..883ff3ffa6f 100644 --- a/source/utils/net_join.c +++ b/source/utils/net_join.c @@ -21,7 +21,7 @@ #include "includes.h" -#if HAVE_ADS +#ifdef HAVE_ADS /* a lame random number generator - used /dev/urandom if possible */ static unsigned one_random(void) |