Convert all uses of uint8/16/32 to uint8/16/32_t in the libads code.

Signed-off-by: Richard Sharpe <rsharpe@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Wed Apr 22 06:22:29 CEST 2015 on sn-devel-104

diff --git a/source3/include/ads.h b/source3/include/ads.h
index 3de1d8b199ef6fd669233605eed4c78b70ffbbef..daea56d58ee2a1305955a2a2354a52f370b197ad 100644 (file)
--- a/source3/include/ads.h
+++ b/source3/include/ads.h
@@ -13,7 +13,7 @@ struct ads_struct;
 
 struct ads_saslwrap_ops {
        const char *name;
-       ADS_STATUS (*wrap)(struct ads_struct *, uint8 *buf, uint32 len);
+       ADS_STATUS (*wrap)(struct ads_struct *, uint8_t *buf, uint32_t len);
        ADS_STATUS (*unwrap)(struct ads_struct *);
        void (*disconnect)(struct ads_struct *);
 };
@@ -53,7 +53,7 @@ typedef struct ads_struct {
 
        /* info derived from the servers config */
        struct {
-               uint32 flags; /* cldap flags identifying the services. */
+               uint32_t flags; /* cldap flags identifying the services. */
                char *realm;
                char *bind_path;
                char *ldap_server_name;
@@ -82,23 +82,23 @@ typedef struct ads_struct {
                const struct ads_saslwrap_ops *wrap_ops;
                void *wrap_private_data;
                struct {
-                       uint32 ofs;
-                       uint32 needed;
-                       uint32 left;
+                       uint32_t ofs;
+                       uint32_t needed;
+                       uint32_t left;
 #define        ADS_SASL_WRAPPING_IN_MAX_WRAPPED        0x0FFFFFFF
-                       uint32 max_wrapped;
-                       uint32 min_wrapped;
-                       uint32 size;
-                       uint8 *buf;
+                       uint32_t max_wrapped;
+                       uint32_t min_wrapped;
+                       uint32_t size;
+                       uint8_t *buf;
                } in;
                struct {
-                       uint32 ofs;
-                       uint32 left;
+                       uint32_t ofs;
+                       uint32_t left;
 #define        ADS_SASL_WRAPPING_OUT_MAX_WRAPPED       0x00A00000
-                       uint32 max_unwrapped;
-                       uint32 sig_size;
-                       uint32 size;
-                       uint8 *buf;
+                       uint32_t max_unwrapped;
+                       uint32_t sig_size;
+                       uint32_t size;
+                       uint8_t *buf;
                } out;
        } ldap;
 #endif /* HAVE_LDAP */

diff --git a/source3/libads/ads_ldap_protos.h b/source3/libads/ads_ldap_protos.h
index 3024ae2ea653b8ddf511d20a145e9e32472ef4c2..b063815678a16f3e1e7e9ec770b63120ea6bb180 100644 (file)
--- a/source3/libads/ads_ldap_protos.h
+++ b/source3/libads/ads_ldap_protos.h
@@ -51,7 +51,7 @@ char **ads_pull_strings_range(ADS_STRUCT *ads,
                              size_t *num_strings,
                              bool *more_strings);
 bool ads_pull_uint32(ADS_STRUCT *ads, LDAPMessage *msg, const char *field,
-                    uint32 *v);
+                    uint32_t *v);
 bool ads_pull_guid(ADS_STRUCT *ads, LDAPMessage *msg, struct GUID *guid);
 bool ads_pull_sid(ADS_STRUCT *ads, LDAPMessage *msg, const char *field,
                  struct dom_sid *sid);
@@ -120,12 +120,12 @@ ADS_STATUS ads_parse_gpo(ADS_STRUCT *ads,
                         const char *gpo_dn,
                         struct GROUP_POLICY_OBJECT *gpo);
 ADS_STATUS ads_search_retry_dn_sd_flags(ADS_STRUCT *ads, LDAPMessage **res,
-                                        uint32 sd_flags,
+                                        uint32_t sd_flags,
                                         const char *dn,
                                         const char **attrs);
 ADS_STATUS ads_do_search_all_sd_flags(ADS_STRUCT *ads, const char *bind_path,
                                       int scope, const char *expr,
-                                      const char **attrs, uint32 sd_flags,
+                                      const char **attrs, uint32_t sd_flags,
                                       LDAPMessage **res);
 ADS_STATUS ads_get_tokensids(ADS_STRUCT *ads,
                              TALLOC_CTX *mem_ctx,

diff --git a/source3/libads/ads_proto.h b/source3/libads/ads_proto.h
index 1e34247e2fe49e0173f3ce2c480431aafa3fb930..224d9927fe01bed1ff7473ada277ceb7b4ebfee6 100644 (file)
--- a/source3/libads/ads_proto.h
+++ b/source3/libads/ads_proto.h
@@ -85,7 +85,7 @@ char *ads_ou_string(ADS_STRUCT *ads, const char *org_unit);
 char *ads_default_ou_string(ADS_STRUCT *ads, const char *wknguid);
 ADS_STATUS ads_add_strlist(TALLOC_CTX *ctx, ADS_MODLIST *mods,
                                const char *name, const char **vals);
-uint32 ads_get_kvno(ADS_STRUCT *ads, const char *account_name);
+uint32_t ads_get_kvno(ADS_STRUCT *ads, const char *account_name);
 uint32_t ads_get_machine_kvno(ADS_STRUCT *ads, const char *machine_name);
 
 bool ads_element_in_array(const char **el_array, size_t num_el, const char *el);
@@ -103,9 +103,9 @@ ADS_STATUS ads_create_machine_acct(ADS_STRUCT *ads, const char *machine_name,
 ADS_STATUS ads_move_machine_acct(ADS_STRUCT *ads, const char *machine_name,
                                  const char *org_unit, bool *moved);
 int ads_count_replies(ADS_STRUCT *ads, void *res);
-ADS_STATUS ads_USN(ADS_STRUCT *ads, uint32 *usn);
+ADS_STATUS ads_USN(ADS_STRUCT *ads, uint32_t *usn);
 ADS_STATUS ads_current_time(ADS_STRUCT *ads);
-ADS_STATUS ads_domain_func_level(ADS_STRUCT *ads, uint32 *val);
+ADS_STATUS ads_domain_func_level(ADS_STRUCT *ads, uint32_t *val);
 ADS_STATUS ads_domain_sid(ADS_STRUCT *ads, struct dom_sid *sid);
 ADS_STATUS ads_site_dn(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, const char **site_name);
 ADS_STATUS ads_site_dn_for_machine(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, const char *computer_name, const char **site_dn);
@@ -122,12 +122,12 @@ char* ads_get_dnshostname( ADS_STRUCT *ads, TALLOC_CTX *ctx, const char *machine
 char* ads_get_upn( ADS_STRUCT *ads, TALLOC_CTX *ctx, const char *machine_name );
 char* ads_get_samaccountname( ADS_STRUCT *ads, TALLOC_CTX *ctx, const char *machine_name );
 ADS_STATUS ads_join_realm(ADS_STRUCT *ads, const char *machine_name,
-                       uint32 account_type, const char *org_unit);
+                       uint32_t account_type, const char *org_unit);
 ADS_STATUS ads_leave_realm(ADS_STRUCT *ads, const char *hostname);
 ADS_STATUS ads_find_samaccount(ADS_STRUCT *ads,
                               TALLOC_CTX *mem_ctx,
                               const char *samaccountname,
-                              uint32 *uac_ret,
+                              uint32_t *uac_ret,
                               const char **dn_ret);
 ADS_STATUS ads_config_path(ADS_STRUCT *ads,
                           TALLOC_CTX *mem_ctx,

diff --git a/source3/libads/ads_status.c b/source3/libads/ads_status.c
index 7465531404d63f732ad0d3164402505356f6e113..70569949aeb2fa1dcfa0d448f6b9ab83fae44d3d 100644 (file)
--- a/source3/libads/ads_status.c
+++ b/source3/libads/ads_status.c
@@ -119,8 +119,8 @@ const char *ads_errstr(ADS_STATUS status)
        case ENUM_ADS_ERROR_GSS:
        {
                char *ret;
-               uint32 msg_ctx;
-               uint32 minor;
+               uint32_t msg_ctx;
+               uint32_t minor;
                gss_buffer_desc msg1, msg2;
 
                msg_ctx = 0;
@@ -147,7 +147,7 @@ const char *ads_errstr(ADS_STATUS status)
 }
 
 #ifdef HAVE_KRB5
-NTSTATUS gss_err_to_ntstatus(uint32 maj, uint32 min)
+NTSTATUS gss_err_to_ntstatus(uint32_t maj, uint32_t min)
 {
         ADS_STATUS adss = ADS_ERROR_GSS(maj, min);
         DEBUG(10,("gss_err_to_ntstatus: Error %s\n",

diff --git a/source3/libads/ads_status.h b/source3/libads/ads_status.h
index ff7c10363804e6f5c95881b9153400b2f1e58218..2ff4ef003b19780e158ee246db6c4b2733f6f2c4 100644 (file)
--- a/source3/libads/ads_status.h
+++ b/source3/libads/ads_status.h
@@ -63,6 +63,6 @@ ADS_STATUS ads_build_nt_error(enum ads_error_type etype,
                           NTSTATUS nt_status);
 NTSTATUS ads_ntstatus(ADS_STATUS status);
 const char *ads_errstr(ADS_STATUS status);
-NTSTATUS gss_err_to_ntstatus(uint32 maj, uint32 min);
+NTSTATUS gss_err_to_ntstatus(uint32_t maj, uint32_t min);
 
 #endif /* _LIBADS_ADS_STATUS_H_ */

diff --git a/source3/libads/disp_sec.c b/source3/libads/disp_sec.c
index 7dcdc95901eb8e0ad9b2b74c719023a14b002bff..472741fa1b6fed133d7941eeb2623520b38ec700 100644 (file)
--- a/source3/libads/disp_sec.c
+++ b/source3/libads/disp_sec.c
@@ -29,7 +29,7 @@
 #ifdef HAVE_LDAP
 
 static struct perm_mask_str {
-       uint32  mask;
+       uint32_t  mask;
        const char   *str;
 } perms[] = {
        {SEC_RIGHTS_FULL_CTRL,          "[Full Control]"},
@@ -59,7 +59,7 @@ static struct perm_mask_str {
 };
 
 /* convert a security permissions into a string */
-static void ads_disp_perms(uint32 type)
+static void ads_disp_perms(uint32_t type)
 {
        int i = 0;
        int j = 0;

diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
index 93d5c791bf0a2c669c2d27ebecc66f95d08e9601..3f5302f0054d4f851b15ffcbd116d4fa5eb4d95c 100644 (file)
--- a/source3/libads/ldap.c
+++ b/source3/libads/ldap.c
@@ -1168,7 +1168,7 @@ static ADS_STATUS ads_do_paged_search(ADS_STRUCT *ads, const char *bind_path,
 
  ADS_STATUS ads_do_search_all_sd_flags(ADS_STRUCT *ads, const char *bind_path,
                                       int scope, const char *expr,
-                                      const char **attrs, uint32 sd_flags, 
+                                      const char **attrs, uint32_t sd_flags, 
                                       LDAPMessage **res)
 {
        ads_control args;
@@ -1779,10 +1779,10 @@ ADS_STATUS ads_add_strlist(TALLOC_CTX *ctx, ADS_MODLIST *mods,
  * @return the kvno for the account, or -1 in case of a failure.
  **/
 
-uint32 ads_get_kvno(ADS_STRUCT *ads, const char *account_name)
+uint32_t ads_get_kvno(ADS_STRUCT *ads, const char *account_name)
 {
        LDAPMessage *res = NULL;
-       uint32 kvno = (uint32)-1;      /* -1 indicates a failure */
+       uint32_t kvno = (uint32)-1;      /* -1 indicates a failure */
        char *filter;
        const char *attrs[] = {"msDS-KeyVersionNumber", NULL};
        char *dn_string = NULL;
@@ -2118,7 +2118,7 @@ ADS_STATUS ads_create_machine_acct(ADS_STRUCT *ads, const char *machine_name,
        const char *objectClass[] = {"top", "person", "organizationalPerson",
                                     "user", "computer", NULL};
        LDAPMessage *res = NULL;
-       uint32 acct_control = ( UF_WORKSTATION_TRUST_ACCOUNT |\
+       uint32_t acct_control = ( UF_WORKSTATION_TRUST_ACCOUNT |\
                                UF_DONT_EXPIRE_PASSWD |\
                                UF_ACCOUNTDISABLE );
 
@@ -2294,7 +2294,7 @@ static void dump_sd(ADS_STRUCT *ads, const char *filed, struct berval **values)
        struct security_descriptor *psd;
        NTSTATUS status;
 
-       status = unmarshall_sec_desc(talloc_tos(), (uint8 *)values[0]->bv_val,
+       status = unmarshall_sec_desc(talloc_tos(), (uint8_t *)values[0]->bv_val,
                                     values[0]->bv_len, &psd);
        if (!NT_STATUS_IS_OK(status)) {
                DEBUG(0, ("unmarshall_sec_desc failed: %s\n",
@@ -2710,7 +2710,7 @@ int ads_count_replies(ADS_STRUCT *ads, void *res)
 }
 
 /**
- * pull a single uint32 from a ADS result
+ * pull a single uint32_t from a ADS result
  * @param ads connection to ads server
  * @param msg Results of search
  * @param field Attribute to retrieve
@@ -2718,7 +2718,7 @@ int ads_count_replies(ADS_STRUCT *ads, void *res)
  * @return boolean inidicating success
 */
  bool ads_pull_uint32(ADS_STRUCT *ads, LDAPMessage *msg, const char *field,
-                     uint32 *v)
+                     uint32_t *v)
 {
        char **values;
 
@@ -2843,7 +2843,7 @@ int ads_count_replies(ADS_STRUCT *ads, void *res)
        if (values[0]) {
                NTSTATUS status;
                status = unmarshall_sec_desc(mem_ctx,
-                                            (uint8 *)values[0]->bv_val,
+                                            (uint8_t *)values[0]->bv_val,
                                             values[0]->bv_len, sd);
                if (!NT_STATUS_IS_OK(status)) {
                        DEBUG(0, ("unmarshall_sec_desc failed: %s\n",
@@ -2893,7 +2893,7 @@ int ads_count_replies(ADS_STRUCT *ads, void *res)
  * @param usn Pointer to retrieved update serial number
  * @return status of search
  **/
-ADS_STATUS ads_USN(ADS_STRUCT *ads, uint32 *usn)
+ADS_STATUS ads_USN(ADS_STRUCT *ads, uint32_t *usn)
 {
        const char *attrs[] = {"highestCommittedUSN", NULL};
        ADS_STATUS status;
@@ -3005,7 +3005,7 @@ done:
 /********************************************************************
 ********************************************************************/
 
-ADS_STATUS ads_domain_func_level(ADS_STRUCT *ads, uint32 *val)
+ADS_STATUS ads_domain_func_level(ADS_STRUCT *ads, uint32_t *val)
 {
        const char *attrs[] = {"domainFunctionality", NULL};
        ADS_STATUS status;
@@ -3496,7 +3496,7 @@ out:
  * @return status of join
  **/
 ADS_STATUS ads_join_realm(ADS_STRUCT *ads, const char *machine_name,
-                       uint32 account_type, const char *org_unit)
+                       uint32_t account_type, const char *org_unit)
 {
        ADS_STATUS status;
        LDAPMessage *res = NULL;
@@ -3692,7 +3692,7 @@ ADS_STATUS ads_leave_realm(ADS_STRUCT *ads, const char *hostname)
        struct dom_sid *tmp_sids;
        struct dom_sid tmp_user_sid;
        struct dom_sid tmp_primary_group_sid;
-       uint32 pgid;
+       uint32_t pgid;
        const char *attrs[] = {
                "objectSid",
                "tokenGroups",
@@ -3774,14 +3774,14 @@ ADS_STATUS ads_leave_realm(ADS_STRUCT *ads, const char *hostname)
  * @param ads connection to ads server
  * @param mem_ctx TALLOC_CTX for allocating sid array
  * @param samaccountname to search
- * @param uac_ret uint32 pointer userAccountControl attribute value
+ * @param uac_ret uint32_t pointer userAccountControl attribute value
  * @param dn_ret pointer to dn
  * @return status of token query
  **/
 ADS_STATUS ads_find_samaccount(ADS_STRUCT *ads,
                               TALLOC_CTX *mem_ctx,
                               const char *samaccountname,
-                              uint32 *uac_ret,
+                              uint32_t *uac_ret,
                               const char **dn_ret)
 {
        ADS_STATUS status;
@@ -3789,7 +3789,7 @@ ADS_STATUS ads_find_samaccount(ADS_STRUCT *ads,
        const char *filter;
        LDAPMessage *res = NULL;
        char *dn = NULL;
-       uint32 uac = 0;
+       uint32_t uac = 0;
 
        filter = talloc_asprintf(mem_ctx, "(&(objectclass=user)(sAMAccountName=%s))",
                samaccountname);

diff --git a/source3/libads/ldap_printer.c b/source3/libads/ldap_printer.c
index e9eb41967f2eb13af97bfb07df59bafd486b54ef..82c131104b9ebd9632abf4a401f0d9fa68a1a686 100644 (file)
--- a/source3/libads/ldap_printer.c
+++ b/source3/libads/ldap_printer.c
@@ -146,7 +146,7 @@ static bool map_dword(TALLOC_CTX *ctx, ADS_MODLIST *mods,
        if (value->type != REG_DWORD) {
                return false;
        }
-       if (value->data.length != sizeof(uint32)) {
+       if (value->data.length != sizeof(uint32_t)) {
                return false;
        }
        str_value = talloc_asprintf(ctx, "%d", IVAL(value->data.data, 0));
@@ -292,7 +292,7 @@ WERROR get_remote_printer_publishing_data(struct rpc_pipe_client *cli,
        char *printername;
        struct spoolss_PrinterEnumValues *info;
        uint32_t count;
-       uint32 i;
+       uint32_t i;
        struct policy_handle pol;
        WERROR werr;
 

diff --git a/source3/libads/ldap_utils.c b/source3/libads/ldap_utils.c
index 88db3a3ab73e09e3ade386029d98e5bc15c7dbfc..117dc557e25ec2688c28afbf56aaad2a61b7e9aa 100644 (file)
--- a/source3/libads/ldap_utils.c
+++ b/source3/libads/ldap_utils.c
@@ -36,7 +36,7 @@ static ADS_STATUS ads_ranged_search_internal(ADS_STRUCT *ads,
                                             const char *range_attr,
                                             char ***strings,
                                             size_t *num_strings,
-                                            uint32 *first_usn,
+                                            uint32_t *first_usn,
                                             int *num_retries,
                                             bool *more_values);
 
@@ -169,7 +169,7 @@ static ADS_STATUS ads_do_search_retry_args(ADS_STRUCT *ads, const char *bind_pat
 }
 
  ADS_STATUS ads_search_retry_dn_sd_flags(ADS_STRUCT *ads, LDAPMessage **res, 
-                                        uint32 sd_flags,
+                                        uint32_t sd_flags,
                                         const char *dn, 
                                         const char **attrs)
 {
@@ -242,7 +242,7 @@ ADS_STATUS ads_ranged_search(ADS_STRUCT *ads,
                             size_t *num_strings)
 {
        ADS_STATUS status;
-       uint32 first_usn;
+       uint32_t first_usn;
        int num_retries = 0;
        const char **attrs;
        bool more_values = False;
@@ -296,14 +296,14 @@ static ADS_STATUS ads_ranged_search_internal(ADS_STRUCT *ads,
                                      const char *range_attr,
                                      char ***strings,
                                      size_t *num_strings,
-                                     uint32 *first_usn,
+                                     uint32_t *first_usn,
                                      int *num_retries,
                                      bool *more_values)
 {
        LDAPMessage *res = NULL;
        ADS_STATUS status;
        int count;
-       uint32 current_usn;
+       uint32_t current_usn;
 
        DEBUG(10, ("Searching for attrs[0] = %s, attrs[1] = %s\n", attrs[0], attrs[1]));
 

diff --git a/source3/libads/sasl.c b/source3/libads/sasl.c
index 8a9e1570f9c54ff5a322b5ec306c44ccb7ac620e..ce3740f2d62bd2696b741309403bad02e410feff 100644 (file)
--- a/source3/libads/sasl.c
+++ b/source3/libads/sasl.c
@@ -28,7 +28,7 @@
 
 #ifdef HAVE_LDAP
 
-static ADS_STATUS ads_sasl_ntlmssp_wrap(ADS_STRUCT *ads, uint8 *buf, uint32 len)
+static ADS_STATUS ads_sasl_ntlmssp_wrap(ADS_STRUCT *ads, uint8_t *buf, uint32_t len)
 {
        struct gensec_security *gensec_security =
                talloc_get_type_abort(ads->ldap.wrap_private_data,
@@ -339,12 +339,12 @@ done:
        return status;
 }
 
-static ADS_STATUS ads_sasl_gssapi_wrap(ADS_STRUCT *ads, uint8 *buf, uint32 len)
+static ADS_STATUS ads_sasl_gssapi_wrap(ADS_STRUCT *ads, uint8_t *buf, uint32_t len)
 {
        gss_ctx_id_t context_handle = (gss_ctx_id_t)ads->ldap.wrap_private_data;
        ADS_STATUS status;
        int gss_rc;
-       uint32 minor_status;
+       uint32_t minor_status;
        gss_buffer_desc unwrapped, wrapped;
        int conf_req_flag, conf_state;
 
@@ -385,7 +385,7 @@ static ADS_STATUS ads_sasl_gssapi_unwrap(ADS_STRUCT *ads)
        gss_ctx_id_t context_handle = (gss_ctx_id_t)ads->ldap.wrap_private_data;
        ADS_STATUS status;
        int gss_rc;
-       uint32 minor_status;
+       uint32_t minor_status;
        gss_buffer_desc unwrapped, wrapped;
        int conf_state;
 
@@ -421,7 +421,7 @@ static ADS_STATUS ads_sasl_gssapi_unwrap(ADS_STRUCT *ads)
 static void ads_sasl_gssapi_disconnect(ADS_STRUCT *ads)
 {
        gss_ctx_id_t context_handle = (gss_ctx_id_t)ads->ldap.wrap_private_data;
-       uint32 minor_status;
+       uint32_t minor_status;
 
        gss_delete_sec_context(&minor_status, &context_handle, GSS_C_NO_BUFFER);
 
@@ -443,7 +443,7 @@ static ADS_STATUS ads_sasl_spnego_gsskrb5_bind(ADS_STRUCT *ads, const gss_name_t
 {
        ADS_STATUS status;
        bool ok;
-       uint32 minor_status;
+       uint32_t minor_status;
        int gss_rc, rc;
        gss_cred_id_t gss_cred = GSS_C_NO_CREDENTIAL;
        gss_OID_desc krb5_mech_type =
@@ -453,8 +453,8 @@ static ADS_STATUS ads_sasl_spnego_gsskrb5_bind(ADS_STRUCT *ads, const gss_name_t
        const char *spnego_mechs[] = {OID_KERBEROS5_OLD, OID_KERBEROS5, OID_NTLMSSP, NULL};
        gss_ctx_id_t context_handle = GSS_C_NO_CONTEXT;
        gss_buffer_desc input_token, output_token;
-       uint32 req_flags, ret_flags;
-       uint32 req_tmp, ret_tmp;
+       uint32_t req_flags, ret_flags;
+       uint32_t req_tmp, ret_tmp;
        DATA_BLOB unwrapped;
        DATA_BLOB wrapped;
        struct berval cred, *scred = NULL;
@@ -653,7 +653,7 @@ static ADS_STATUS ads_sasl_spnego_gsskrb5_bind(ADS_STRUCT *ads, const gss_name_t
        }
 
        if (ads->ldap.wrap_type > ADS_SASLWRAP_TYPE_PLAIN) {
-               uint32 max_msg_size = ADS_SASL_WRAPPING_OUT_MAX_WRAPPED;
+               uint32_t max_msg_size = ADS_SASL_WRAPPING_OUT_MAX_WRAPPED;
 
                gss_rc = gss_wrap_size_limit(&minor_status, context_handle,
                                             (ads->ldap.wrap_type == ADS_SASLWRAP_TYPE_SEAL),
@@ -703,7 +703,7 @@ static void ads_free_service_principal(struct ads_service_principal *p)
 
 #ifdef HAVE_KRB5
        if (p->name) {
-               uint32 minor_status;
+               uint32_t minor_status;
                gss_release_name(&minor_status, &p->name);
        }
 #endif
@@ -816,7 +816,7 @@ static ADS_STATUS ads_generate_service_principal(ADS_STRUCT *ads,
        /* GSS_KRB5_NT_PRINCIPAL_NAME */
        gss_OID_desc nt_principal =
        {10, discard_const_p(char, "\x2a\x86\x48\x86\xf7\x12\x01\x02\x02\x01")};
-       uint32 minor_status;
+       uint32_t minor_status;
        int gss_rc;
 #endif
 
@@ -1036,20 +1036,20 @@ failed:
 */
 static ADS_STATUS ads_sasl_gssapi_do_bind(ADS_STRUCT *ads, const gss_name_t serv_name)
 {
-       uint32 minor_status;
+       uint32_t minor_status;
        gss_cred_id_t gss_cred = GSS_C_NO_CREDENTIAL;
        gss_ctx_id_t context_handle = GSS_C_NO_CONTEXT;
        gss_OID mech_type = GSS_C_NULL_OID;
        gss_buffer_desc output_token, input_token;
-       uint32 req_flags, ret_flags;
+       uint32_t req_flags, ret_flags;
        int conf_state;
        struct berval cred;
        struct berval *scred = NULL;
        int i=0;
        int gss_rc, rc;
-       uint8 *p;
-       uint32 max_msg_size = ADS_SASL_WRAPPING_OUT_MAX_WRAPPED;
-       uint8 wrap_type = ADS_SASLWRAP_TYPE_PLAIN;
+       uint8_t *p;
+       uint32_t max_msg_size = ADS_SASL_WRAPPING_OUT_MAX_WRAPPED;
+       uint8_t wrap_type = ADS_SASLWRAP_TYPE_PLAIN;
        ADS_STATUS status;
 
        input_token.value = NULL;
@@ -1126,7 +1126,7 @@ static ADS_STATUS ads_sasl_gssapi_do_bind(ADS_STRUCT *ads, const gss_name_t serv
                goto failed;
        }
 
-       p = (uint8 *)output_token.value;
+       p = (uint8_t *)output_token.value;
 
 #if 0
        file_save("sasl_gssapi.dat", output_token.value, output_token.length);
@@ -1164,7 +1164,7 @@ static ADS_STATUS ads_sasl_gssapi_do_bind(ADS_STRUCT *ads, const gss_name_t serv
                status = ADS_ERROR_NT(NT_STATUS_NO_MEMORY);
                goto failed;
        }
-       p = (uint8 *)output_token.value;
+       p = (uint8_t *)output_token.value;
 
        RSIVAL(p,0,max_msg_size);
        SCVAL(p,0,ads->ldap.wrap_type);

diff --git a/source3/libads/sasl_wrapping.c b/source3/libads/sasl_wrapping.c
index d7353ac79c967e1804b2b780a882ca776390a555..9296d60ba9d3b13691d95af24e107df57159a436 100644 (file)
--- a/source3/libads/sasl_wrapping.c
+++ b/source3/libads/sasl_wrapping.c
@@ -171,7 +171,7 @@ eagain:
        return -1;
 }
 
-static ber_slen_t ads_saslwrap_prepare_outbuf(ADS_STRUCT *ads, uint32 len)
+static ber_slen_t ads_saslwrap_prepare_outbuf(ADS_STRUCT *ads, uint32_t len)
 {
        ads->ldap.out.ofs       = 0;
        ads->ldap.out.left      = 0;