<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[15411] PyKerberos/trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/15411">15411</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2016-01-06 14:26:58 -0800 (Wed, 06 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix authGSSServerInit per #924.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#PyKerberostrunkpysrckerberospy">PyKerberos/trunk/pysrc/kerberos.py</a></li>
<li><a href="#PyKerberostrunksetuppy">PyKerberos/trunk/setup.py</a></li>
<li><a href="#PyKerberostrunksrckerberosgssc">PyKerberos/trunk/src/kerberosgss.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="PyKerberostrunkpysrckerberospy"></a>
<div class="modfile"><h4>Modified: PyKerberos/trunk/pysrc/kerberos.py (15410 => 15411)</h4>
<pre class="diff"><span>
<span class="info">--- PyKerberos/trunk/pysrc/kerberos.py 2016-01-04 17:07:32 UTC (rev 15410)
+++ PyKerberos/trunk/pysrc/kerberos.py 2016-01-06 22:26:58 UTC (rev 15411)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> ##
</span><del>-# Copyright (c) 2006-2015 Apple Inc. All rights reserved.
</del><ins>+# Copyright (c) 2006-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> #
</span><span class="cx"> # Licensed under the Apache License, Version 2.0 (the "License");
</span><span class="cx"> # you may not use this file except in compliance with the License.
</span><span class="lines">@@ -266,7 +266,8 @@
</span><span class="cx"> to dispose of the context once all GSSAPI operations are complete.
</span><span class="cx">
</span><span class="cx"> @param service: A string containing the service principal in the form
</span><del>- C{"type@fqdn"}.
</del><ins>+ C{"type@fqdn"}. To initialize the context for the purpose of accepting
+ delegated credentials, pass the literal string C{"DELEGATE"}.
</ins><span class="cx">
</span><span class="cx"> @return: A tuple of (result, context) where result is the result code (see
</span><span class="cx"> above) and context is an opaque value that will need to be passed to
</span></span></pre></div>
<a id="PyKerberostrunksetuppy"></a>
<div class="modfile"><h4>Modified: PyKerberos/trunk/setup.py (15410 => 15411)</h4>
<pre class="diff"><span>
<span class="info">--- PyKerberos/trunk/setup.py 2016-01-04 17:07:32 UTC (rev 15410)
+++ PyKerberos/trunk/setup.py 2016-01-06 22:26:58 UTC (rev 15411)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> ##
</span><del>-# Copyright (c) 2006-2015 Apple Inc. All rights reserved.
</del><ins>+# Copyright (c) 2006-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> #
</span><span class="cx"> # Licensed under the Apache License, Version 2.0 (the "License");
</span><span class="cx"> # you may not use this file except in compliance with the License.
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx">
</span><span class="cx"> project_name = "kerberos"
</span><span class="cx">
</span><del>-version_string = "1.2.2"
</del><ins>+version_string = "1.2.3"
</ins><span class="cx">
</span><span class="cx"> description = "Kerberos high-level interface"
</span><span class="cx">
</span></span></pre></div>
<a id="PyKerberostrunksrckerberosgssc"></a>
<div class="modfile"><h4>Modified: PyKerberos/trunk/src/kerberosgss.c (15410 => 15411)</h4>
<pre class="diff"><span>
<span class="info">--- PyKerberos/trunk/src/kerberosgss.c 2016-01-04 17:07:32 UTC (rev 15410)
+++ PyKerberos/trunk/src/kerberosgss.c 2016-01-06 22:26:58 UTC (rev 15411)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /**
</span><del>- * Copyright (c) 2006-2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (c) 2006-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Licensed under the Apache License, Version 2.0 (the "License");
</span><span class="cx"> * you may not use this file except in compliance with the License.
</span><span class="lines">@@ -93,8 +93,7 @@
</span><span class="cx">
</span><span class="cx"> if (strncmp(pname, match, match_len) == 0) {
</span><span class="cx"> result = malloc(strlen(pname) + 1);
</span><del>- if (result == NULL)
- {
</del><ins>+ if (result == NULL) {
</ins><span class="cx"> PyErr_NoMemory();
</span><span class="cx"> goto end;
</span><span class="cx"> }
</span><span class="lines">@@ -288,8 +287,7 @@
</span><span class="cx"> // Grab the client response to send back to the server
</span><span class="cx"> if (output_token.length) {
</span><span class="cx"> state->response = base64_encode((const unsigned char *)output_token.value, output_token.length);
</span><del>- if (state->response == NULL)
- {
</del><ins>+ if (state->response == NULL) {
</ins><span class="cx"> PyErr_NoMemory();
</span><span class="cx"> ret = AUTH_GSS_ERROR;
</span><span class="cx"> goto end;
</span><span class="lines">@@ -311,8 +309,9 @@
</span><span class="cx"> name_token.length = 0;
</span><span class="cx"> maj_stat = gss_display_name(&min_stat, gssuser, &name_token, NULL);
</span><span class="cx"> if (GSS_ERROR(maj_stat)) {
</span><del>- if (name_token.value)
</del><ins>+ if (name_token.value) {
</ins><span class="cx"> gss_release_buffer(&min_stat, &name_token);
</span><ins>+ }
</ins><span class="cx"> gss_release_name(&min_stat, &gssuser);
</span><span class="cx">
</span><span class="cx"> set_gss_error(maj_stat, min_stat);
</span><span class="lines">@@ -320,8 +319,7 @@
</span><span class="cx"> goto end;
</span><span class="cx"> } else {
</span><span class="cx"> state->username = (char *)malloc(name_token.length + 1);
</span><del>- if (state->username == NULL)
- {
</del><ins>+ if (state->username == NULL) {
</ins><span class="cx"> PyErr_NoMemory();
</span><span class="cx"> ret = AUTH_GSS_ERROR;
</span><span class="cx"> goto end;
</span><span class="lines">@@ -577,29 +575,35 @@
</span><span class="cx"> state->targetname = NULL;
</span><span class="cx"> state->response = NULL;
</span><span class="cx"> state->ccname = NULL;
</span><ins>+ int cred_usage = GSS_C_ACCEPT;
</ins><span class="cx">
</span><span class="cx"> // Server name may be empty which means we aren't going to create our own creds
</span><span class="cx"> size_t service_len = strlen(service);
</span><span class="cx"> if (service_len != 0) {
</span><span class="cx"> // Import server name first
</span><del>- name_token.length = strlen(service);
- name_token.value = (char *)service;
</del><ins>+ if (strcmp(service, "DELEGATE") == 0) {
+ cred_usage = GSS_C_BOTH;
+ }
+ else {
+ name_token.length = strlen(service);
+ name_token.value = (char *)service;
</ins><span class="cx">
</span><del>- maj_stat = gss_import_name(
- &min_stat, &name_token, GSS_C_NT_HOSTBASED_SERVICE,
- &state->server_name
- );
</del><ins>+ maj_stat = gss_import_name(
+ &min_stat, &name_token, GSS_C_NT_HOSTBASED_SERVICE,
+ &state->server_name
+ );
</ins><span class="cx">
</span><del>- if (GSS_ERROR(maj_stat)) {
- set_gss_error(maj_stat, min_stat);
- ret = AUTH_GSS_ERROR;
- goto end;
- }
</del><ins>+ if (GSS_ERROR(maj_stat)) {
+ set_gss_error(maj_stat, min_stat);
+ ret = AUTH_GSS_ERROR;
+ goto end;
+ }
+ }
</ins><span class="cx">
</span><span class="cx"> // Get credentials
</span><span class="cx"> maj_stat = gss_acquire_cred(
</span><del>- &min_stat, GSS_C_NO_NAME, GSS_C_INDEFINITE, GSS_C_NO_OID_SET,
- GSS_C_BOTH, &state->server_creds, NULL, NULL
</del><ins>+ &min_stat, state->server_name, GSS_C_INDEFINITE, GSS_C_NO_OID_SET,
+ cred_usage, &state->server_creds, NULL, NULL
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> if (GSS_ERROR(maj_stat)) {
</span><span class="lines">@@ -975,8 +979,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> state->ccname = (char *)malloc(32*sizeof(char));
</span><del>- if (state->ccname == NULL)
- {
</del><ins>+ if (state->ccname == NULL) {
</ins><span class="cx"> PyErr_NoMemory();
</span><span class="cx"> return 1;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>