r5136: fix types

metze
(This used to be commit 344367cc4cdb232c394ce45ab64cc357cce4259f)

diff --git a/source4/libcli/auth/gensec.c b/source4/libcli/auth/gensec.c
index e9dea6be33d44a2a87903111dbaab831d654ddb4..e0fa27359a2ec7eefa563b6366f2ac00de018256 100644 (file)
--- a/source4/libcli/auth/gensec.c
+++ b/source4/libcli/auth/gensec.c
@@ -487,7 +487,7 @@ NTSTATUS gensec_update(struct gensec_security *gensec_security, TALLOC_CTX *out_
  */
 
 void gensec_want_feature(struct gensec_security *gensec_security,
-                        uint32 feature) 
+                        uint32_t feature) 
 {
        gensec_security->want_features |= feature;
 }
@@ -498,7 +498,7 @@ void gensec_want_feature(struct gensec_security *gensec_security,
  */
 
 BOOL gensec_have_feature(struct gensec_security *gensec_security,
-                        uint32 feature) 
+                        uint32_t feature) 
 {
        if (!gensec_security->ops->have_feature) {
                return False;

diff --git a/source4/libcli/auth/gensec.h b/source4/libcli/auth/gensec.h
index 434f3fdb4d97bc37dd6556711e421fa96ddb1b3d..a555584840e521543c222f30257c4a429e539b05 100644 (file)
--- a/source4/libcli/auth/gensec.h
+++ b/source4/libcli/auth/gensec.h
@@ -58,7 +58,7 @@ struct auth_session_info;
 struct gensec_security_ops {
        const char *name;
        const char *sasl_name;
-       uint8 auth_type;  /* 0 if not offered on DCE-RPC */
+       uint8_t auth_type;  /* 0 if not offered on DCE-RPC */
        const char *oid;  /* NULL if not offered by SPENGO */
        NTSTATUS (*client_start)(struct gensec_security *gensec_security);
        NTSTATUS (*server_start)(struct gensec_security *gensec_security);
@@ -93,7 +93,7 @@ struct gensec_security_ops {
        NTSTATUS (*session_info)(struct gensec_security *gensec_security, 
                                 struct auth_session_info **session_info); 
        BOOL (*have_feature)(struct gensec_security *gensec_security,
-                                   uint32 feature); 
+                                   uint32_t feature); 
        BOOL enabled;
 };
        
@@ -109,7 +109,7 @@ struct gensec_security {
        struct gensec_target target;
        enum gensec_role gensec_role;
        BOOL subcontext;
-       uint32 want_features;
+       uint32_t want_features;
 };
 
 /* this structure is used by backends to determine the size of some critical types */

diff --git a/source4/libcli/auth/gssapi_parse.c b/source4/libcli/auth/gssapi_parse.c
index e1fb2e9cf585cbf03d3d755821dd51baa4c9f9af..f984f6303f08960fe5c16763c1b927f207b68ea3 100644 (file)
--- a/source4/libcli/auth/gssapi_parse.c
+++ b/source4/libcli/auth/gssapi_parse.c
@@ -31,7 +31,7 @@
 /*
   generate a krb5 GSS-API wrapper packet given a ticket
 */
-DATA_BLOB gensec_gssapi_gen_krb5_wrap(TALLOC_CTX *mem_ctx, const DATA_BLOB *ticket, const uint8 tok_id[2])
+DATA_BLOB gensec_gssapi_gen_krb5_wrap(TALLOC_CTX *mem_ctx, const DATA_BLOB *ticket, const uint8_t tok_id[2])
 {
        struct asn1_data data;
        DATA_BLOB ret = data_blob(NULL,0);
@@ -63,7 +63,7 @@ DATA_BLOB gensec_gssapi_gen_krb5_wrap(TALLOC_CTX *mem_ctx, const DATA_BLOB *tick
 /*
   parse a krb5 GSS-API wrapper packet giving a ticket
 */
-BOOL gensec_gssapi_parse_krb5_wrap(TALLOC_CTX *mem_ctx, const DATA_BLOB *blob, DATA_BLOB *ticket, uint8 tok_id[2])
+BOOL gensec_gssapi_parse_krb5_wrap(TALLOC_CTX *mem_ctx, const DATA_BLOB *blob, DATA_BLOB *ticket, uint8_t tok_id[2])
 {
        BOOL ret;
        struct asn1_data data;

diff --git a/source4/libcli/auth/spnego.h b/source4/libcli/auth/spnego.h
index 3b9d148c67840f54bc4ec8f8f3e9b4381a72d61b..1064370146618027c56f09958bdfddd71d4f06cf 100644 (file)
--- a/source4/libcli/auth/spnego.h
+++ b/source4/libcli/auth/spnego.h
@@ -49,7 +49,7 @@ struct spnego_negTokenInit {
 };
 
 struct spnego_negTokenTarg {
-       uint8 negResult;
+       uint8_t negResult;
        const char *supportedMech;
        DATA_BLOB responseToken;
        DATA_BLOB mechListMIC;