<!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>[15659] PyKerberos/trunk/src/kerberos.c</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/15659">15659</a></dd>
<dt>Author</dt> <dd>dre@apple.com</dd>
<dt>Date</dt> <dd>2016-06-06 17:13:05 -0700 (Mon, 06 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Contributed patch to fix 'ValueError: PyCapsule_SetPointer called with null pointer' on python3. Regression testing was also performed on python2.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#PyKerberostrunksrckerberosc">PyKerberos/trunk/src/kerberos.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="PyKerberostrunksrckerberosc"></a>
<div class="modfile"><h4>Modified: PyKerberos/trunk/src/kerberos.c (15658 => 15659)</h4>
<pre class="diff"><span>
<span class="info">--- PyKerberos/trunk/src/kerberos.c 2016-06-06 18:21:21 UTC (rev 15658)
+++ PyKerberos/trunk/src/kerberos.c 2016-06-07 00:13:05 UTC (rev 15659)
</span><span class="lines">@@ -63,6 +63,9 @@
</span><span class="cx"> static char spnego_mech_oid_bytes[] = "\x2b\x06\x01\x05\x05\x02";
</span><span class="cx"> gss_OID_desc spnego_mech_oid = { 6, &spnego_mech_oid_bytes };
</span><span class="cx">
</span><ins>+char STATE_NULL_C = 'C';
+void* STATE_NULL = &STATE_NULL_C;
+
</ins><span class="cx"> PyObject *KrbException_class;
</span><span class="cx"> PyObject *BasicAuthException_class;
</span><span class="cx"> PyObject *PwdChangeException_class;
</span><span class="lines">@@ -198,11 +201,11 @@
</span><span class="cx">
</span><span class="cx"> state = (gss_client_state *)PyCObject_AsVoidPtr(pystate);
</span><span class="cx">
</span><del>- if (state != NULL) {
</del><ins>+ if (state != STATE_NULL) {
</ins><span class="cx"> result = authenticate_gss_client_clean(state);
</span><span class="cx">
</span><span class="cx"> free(state);
</span><del>- PyCObject_SetVoidPtr(pystate, NULL);
</del><ins>+ PyCObject_SetVoidPtr(pystate, STATE_NULL);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return Py_BuildValue("i", result);
</span><span class="lines">@@ -226,7 +229,7 @@
</span><span class="cx">
</span><span class="cx"> state = (gss_client_state *)PyCObject_AsVoidPtr(pystate);
</span><span class="cx">
</span><del>- if (state == NULL) {
</del><ins>+ if (state == STATE_NULL) {
</ins><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -255,7 +258,7 @@
</span><span class="cx">
</span><span class="cx"> state = (gss_client_state *)PyCObject_AsVoidPtr(pystate);
</span><span class="cx">
</span><del>- if (state == NULL) {
</del><ins>+ if (state == STATE_NULL) {
</ins><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -278,7 +281,7 @@
</span><span class="cx">
</span><span class="cx"> state = (gss_server_state *)PyCObject_AsVoidPtr(pystate);
</span><span class="cx">
</span><del>- if (state == NULL) {
</del><ins>+ if (state == STATE_NULL) {
</ins><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -301,7 +304,7 @@
</span><span class="cx">
</span><span class="cx"> state = (gss_client_state *)PyCObject_AsVoidPtr(pystate);
</span><span class="cx">
</span><del>- if (state == NULL) {
</del><ins>+ if (state == STATE_NULL) {
</ins><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -324,7 +327,7 @@
</span><span class="cx">
</span><span class="cx"> state = (gss_client_state *)PyCObject_AsVoidPtr(pystate);
</span><span class="cx">
</span><del>- if (state == NULL) {
</del><ins>+ if (state == STATE_NULL) {
</ins><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -349,7 +352,7 @@
</span><span class="cx">
</span><span class="cx"> state = (gss_client_state *)PyCObject_AsVoidPtr(pystate);
</span><span class="cx">
</span><del>- if (state == NULL) {
</del><ins>+ if (state == STATE_NULL) {
</ins><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -384,7 +387,7 @@
</span><span class="cx">
</span><span class="cx"> state = (gss_client_state *)PyCObject_AsVoidPtr(pystate);
</span><span class="cx">
</span><del>- if (state == NULL) {
</del><ins>+ if (state == STATE_NULL) {
</ins><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -412,7 +415,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> state = (gss_client_state *)PyCObject_AsVoidPtr(pystate);
</span><del>- if (state == NULL) {
</del><ins>+ if (state == STATE_NULL) {
</ins><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -469,11 +472,11 @@
</span><span class="cx">
</span><span class="cx"> state = (gss_server_state *)PyCObject_AsVoidPtr(pystate);
</span><span class="cx">
</span><del>- if (state != NULL) {
</del><ins>+ if (state != STATE_NULL) {
</ins><span class="cx"> result = authenticate_gss_server_clean(state);
</span><span class="cx">
</span><span class="cx"> free(state);
</span><del>- PyCObject_SetVoidPtr(pystate, NULL);
</del><ins>+ PyCObject_SetVoidPtr(pystate, STATE_NULL);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return Py_BuildValue("i", result);
</span><span class="lines">@@ -497,7 +500,7 @@
</span><span class="cx">
</span><span class="cx"> state = (gss_server_state *)PyCObject_AsVoidPtr(pystate);
</span><span class="cx">
</span><del>- if (state == NULL) {
</del><ins>+ if (state == STATE_NULL) {
</ins><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -527,7 +530,7 @@
</span><span class="cx">
</span><span class="cx"> state = (gss_server_state *)PyCObject_AsVoidPtr(pystate);
</span><span class="cx">
</span><del>- if (state == NULL) {
</del><ins>+ if (state == STATE_NULL) {
</ins><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -556,7 +559,7 @@
</span><span class="cx">
</span><span class="cx"> state = (gss_server_state *)PyCObject_AsVoidPtr(pystate);
</span><span class="cx">
</span><del>- if (state == NULL) {
</del><ins>+ if (state == STATE_NULL) {
</ins><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -579,7 +582,7 @@
</span><span class="cx">
</span><span class="cx"> state = (gss_server_state *)PyCObject_AsVoidPtr(pystate);
</span><span class="cx">
</span><del>- if (state == NULL) {
</del><ins>+ if (state == STATE_NULL) {
</ins><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -602,7 +605,7 @@
</span><span class="cx">
</span><span class="cx"> state = (gss_server_state *)PyCObject_AsVoidPtr(pystate);
</span><span class="cx">
</span><del>- if (state == NULL) {
</del><ins>+ if (state == STATE_NULL) {
</ins><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -625,7 +628,7 @@
</span><span class="cx">
</span><span class="cx"> state = (gss_server_state *)PyCObject_AsVoidPtr(pystate);
</span><span class="cx">
</span><del>- if (state == NULL) {
</del><ins>+ if (state == STATE_NULL) {
</ins><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>