fixed some krb5 ifdefs

(This used to be commit 23ef22f11700bbaa5778a9678a990a2b041fcefe)

diff --git a/source3/client/client.c b/source3/client/client.c
index c3d1fbc7ecca5d4040e0169fb7122ccb607f3aa3..c1b4ade011d99a33ae63e1239faa397c5393887b 100644 (file)
--- a/source3/client/client.c
+++ b/source3/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/source3/lib/charcnv.c b/source3/lib/charcnv.c
index ab9554f84860f1bdc6232e01ba991b473d6bf49d..2e5413c5c0b6b42f4434abaf8bdae7e46f5e3bc2 100644 (file)
--- a/source3/lib/charcnv.c
+++ b/source3/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/source3/libads/krb5_setpw.c b/source3/libads/krb5_setpw.c
index 5cb3de1bb58fac04fc9a0589cb9857ecd955826c..1c3b15d2a5706b91e6a6700b561d63dfa5e64bd0 100644 (file)
--- a/source3/libads/krb5_setpw.c
+++ b/source3/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/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index 0fceac70e2afdacf7c4f02e04b96d21784f273f4..cfbb6d622285e73bca5f21e5348a26308df7dbf9 100644 (file)
--- a/source3/libsmb/cliconnect.c
+++ b/source3/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/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c
index 37b92b8d99f102d8c2652ad9106e41b498b697fe..03fb6a566902e160803101fa9863e08701c78f49 100644 (file)
--- a/source3/libsmb/clikrb5.c
+++ b/source3/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/source3/smbd/sesssetup.c b/source3/smbd/sesssetup.c
index f9d52e9be40b13cd57bbc4a570d419720a0bb111..863a50904231c544d747cf6d4291a9a000ed9461 100644 (file)
--- a/source3/smbd/sesssetup.c
+++ b/source3/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/source3/utils/net_join.c b/source3/utils/net_join.c
index 793d72ac7ee1bb99dc3329c59901bb0fd1b966ca..883ff3ffa6f6390f0e9e1689a0b399c5d790cd3d 100644 (file)
--- a/source3/utils/net_join.c
+++ b/source3/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)