Changeset 988 for vendor/current/lib/addns/dnsgss.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/lib/addns/dnsgss.c (modified) (7 diffs)

vendor/current/lib/addns/dnsgss.c

@@ -27 +27 @@
 
 
-#ifdef HAVE_GSSAPI_SUPPORT
+#ifdef HAVE_GSSAPI
 
 /*********************************************************************
@@ -93 +93 @@
 
         gss_OID_desc krb5_oid_desc =
-                { 9, (char *)"\x2a\x86\x48\x86\xf7\x12\x01\x02\x02" };
+                { 9, discard_const("\x2a\x86\x48\x86\xf7\x12\x01\x02\x02") };
 
         *ctx = GSS_C_NO_CONTEXT;
@@ -126 +126 @@
                                 req, keyname, "gss.microsoft.com", t,
                                 t + 86400, DNS_TKEY_MODE_GSSAPI, 0,
-                                output_desc.length, (uint8 *)output_desc.value,
+                                output_desc.length, (uint8_t *)output_desc.value,
                                 &rec );
                         if (!ERR_DNS_IS_OK(err)) goto error;
@@ -231 +231 @@
 
         gss_OID_desc nt_host_oid_desc =
-                {10, (char *)"\x2a\x86\x48\x86\xf7\x12\x01\x02\x02\x01"};
+                {10, discard_const("\x2a\x86\x48\x86\xf7\x12\x01\x02\x02\x01")};
 
         TALLOC_CTX *mem_ctx;
@@ -281 +281 @@
                           const char *keyname,
                           const char *algorithmname,
-                          time_t time_signed, uint16 fudge)
+                          time_t time_signed, uint16_t fudge)
 {
         struct dns_buffer *buf;
@@ -328 +328 @@
 
         err = dns_create_tsig_record(buf, keyname, algorithmname, time_signed,
-                                     fudge, mic.length, (uint8 *)mic.value,
+                                     fudge, mic.length, (uint8_t *)mic.value,
                                      req->id, 0, &rec);
         gss_release_buffer(&minor, &mic);
@@ -340 +340 @@
 }
 
-#endif  /* HAVE_GSSAPI_SUPPORT */
+#endif  /* HAVE_GSSAPI */