Changeset 989 for vendor/current/auth/kerberos

Timestamp:

Nov 25, 2016, 8:04:54 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.7

File:

• vendor/current/auth/kerberos/gssapi_pac.c (modified) (4 diffs)

vendor/current/auth/kerberos/gssapi_pac.c

@@ -247 +247 @@
                 const uint8_t *p;
 
+                *keytype = 0;
                 if (set->count < 2) {
 
@@ -257 +258 @@
                                 *keytype = KRB5_KEY_TYPE(subkey);
                                 krb5_free_keyblock(NULL /* should be krb5_context */, subkey);
-                        } else
-#else
-                        {
-                                *keytype = 0;
                         }
 #endif
@@ -271 +268 @@
                                   gse_sesskeytype_oid.length) != 0) {
                         /* Perhaps a non-krb5 session key */
-                        *keytype = 0;
                         gss_maj = gss_release_buffer_set(&gss_min, &set);
                         return NT_STATUS_OK;
@@ -281 +277 @@
                         return NT_STATUS_INVALID_PARAMETER;
                 }
-                *keytype = 0;
                 for (i = 0; i < diflen; i++) {
                         *keytype = (*keytype << 7) | (p[i] & 0x7f);