[CalendarServer-changes] [14618] PyKerberos/trunk/src/kerberos.c

source_changes at macosforge.org source_changes at macosforge.org
Thu Mar 26 14:28:46 PDT 2015


Revision: 14618
          http://trac.calendarserver.org//changeset/14618
Author:   wsanchez at apple.com
Date:     2015-03-26 14:28:46 -0700 (Thu, 26 Mar 2015)
Log Message:
-----------
cleanup

Modified Paths:
--------------
    PyKerberos/trunk/src/kerberos.c

Modified: PyKerberos/trunk/src/kerberos.c
===================================================================
--- PyKerberos/trunk/src/kerberos.c	2015-03-26 21:11:48 UTC (rev 14617)
+++ PyKerberos/trunk/src/kerberos.c	2015-03-26 21:28:46 UTC (rev 14618)
@@ -42,18 +42,18 @@
 #endif
 // Handle differences in module definition syntax and interface
 #if PY_MAJOR_VERSION >= 3
-  #define MOD_ERROR_VAL NULL
-  #define MOD_SUCCESS_VAL(val) val
-  #define MOD_INIT(name) PyMODINIT_FUNC PyInit_##name(void)
-  #define MOD_DEF(ob, name, doc, methods) \
+    #define MOD_ERROR_VAL NULL
+    #define MOD_SUCCESS_VAL(val) val
+    #define MOD_INIT(name) PyMODINIT_FUNC PyInit_##name(void)
+    #define MOD_DEF(ob, name, doc, methods) \
           static struct PyModuleDef moduledef = { \
             PyModuleDef_HEAD_INIT, name, doc, -1, methods, }; \
           ob = PyModule_Create(&moduledef);
 #else
-  #define MOD_ERROR_VAL
-  #define MOD_SUCCESS_VAL(val)
-  #define MOD_INIT(name) void init##name(void)
-  #define MOD_DEF(ob, name, doc, methods) \
+    #define MOD_ERROR_VAL
+    #define MOD_SUCCESS_VAL(val)
+    #define MOD_INIT(name) void init##name(void)
+    #define MOD_DEF(ob, name, doc, methods) \
           ob = Py_InitModule3(name, methods, doc);
 #endif
 
@@ -71,15 +71,17 @@
     const char *default_realm = NULL;
     int result = 0;
 
-    if (!PyArg_ParseTuple(args, "ssss", &user, &pswd, &service, &default_realm))
+    if (! PyArg_ParseTuple(args, "ssss", &user, &pswd, &service, &default_realm)) {
         return NULL;
+    }
 
     result = authenticate_user_krb5pwd(user, pswd, service, default_realm);
 
-    if (result)
+    if (result) {
         return Py_INCREF(Py_True), Py_True;
-    else
+    } else {
         return NULL;
+    }
 }
 
 static PyObject *changePassword(PyObject *self, PyObject *args)
@@ -89,15 +91,17 @@
     const char *user = NULL;
     int result = 0;
 
-    if (!PyArg_ParseTuple(args, "sss", &user, &oldpswd, &newpswd))
+    if (! PyArg_ParseTuple(args, "sss", &user, &oldpswd, &newpswd)) {
         return NULL;
+    }
 
     result = change_user_krb5pwd(user, oldpswd, newpswd);
 
-    if (result)
-	return Py_INCREF(Py_True), Py_True;
-    else
-	return NULL;
+    if (result) {
+        return Py_INCREF(Py_True), Py_True;
+    } else {
+        return NULL;
+    }
 }
 
 static PyObject *getServerPrincipalDetails(PyObject *self, PyObject *args)
@@ -106,19 +110,19 @@
     const char *hostname = NULL;
     char* result;
 
-    if (!PyArg_ParseTuple(args, "ss", &service, &hostname))
+    if (! PyArg_ParseTuple(args, "ss", &service, &hostname)) {
         return NULL;
+    }
 
     result = server_principal_details(service, hostname);
 
-    if (result != NULL)
-    {
+    if (result != NULL) {
         PyObject* pyresult = Py_BuildValue("s", result);
         free(result);
         return pyresult;
+    } else {
+        return NULL;
     }
-    else
-        return NULL;
 }
 
 static PyObject* authGSSClientInit(PyObject* self, PyObject* args, PyObject* keywds)
@@ -129,22 +133,33 @@
     PyObject *pystate;
     gss_server_state *delegatestate = NULL;
     PyObject *pydelegatestate;
-    static char *kwlist[] = {"service", "principal", "gssflags", "delegated", NULL};
+    static char *kwlist[] = {
+        "service", "principal", "gssflags", "delegated", NULL
+    };
     long int gss_flags = GSS_C_MUTUAL_FLAG | GSS_C_SEQUENCE_FLAG;
     int result = 0;
 
-    if (!PyArg_ParseTupleAndKeywords(args, keywds, "s|slO", kwlist, &service, &principal, &gss_flags, &pydelegatestate))
+    if (! PyArg_ParseTupleAndKeywords(
+        args, keywds, "s|slO", kwlist,
+        &service, &principal, &gss_flags, &pydelegatestate
+    )) {
         return NULL;
+    }
 
     state = (gss_client_state *) malloc(sizeof(gss_client_state));
     pystate = PyCObject_FromVoidPtr(state, NULL);
 
-    if (PyCObject_Check(pydelegatestate))
+    if (PyCObject_Check(pydelegatestate)) {
         delegatestate = PyCObject_AsVoidPtr(pydelegatestate);
+    }
 
-    result = authenticate_gss_client_init(service, principal, gss_flags, delegatestate, state);
-    if (result == AUTH_GSS_ERROR)
+    result = authenticate_gss_client_init(
+        service, principal, gss_flags, delegatestate, state
+    );
+
+    if (result == AUTH_GSS_ERROR) {
         return NULL;
+    }
 
     return Py_BuildValue("(iO)", result, pystate);
 }
@@ -155,8 +170,9 @@
     PyObject *pystate;
     int result = 0;
 
-    if (!PyArg_ParseTuple(args, "O", &pystate))
+    if (! PyArg_ParseTuple(args, "O", &pystate)) {
         return NULL;
+    }
 
     if (!PyCObject_Check(pystate)) {
         PyErr_SetString(PyExc_TypeError, "Expected a context object");
@@ -164,8 +180,8 @@
     }
 
     state = (gss_client_state *)PyCObject_AsVoidPtr(pystate);
-    if (state != NULL)
-    {
+
+    if (state != NULL) {
         result = authenticate_gss_client_clean(state);
 
         free(state);
@@ -182,21 +198,26 @@
     char *challenge = NULL;
     int result = 0;
 
-    if (!PyArg_ParseTuple(args, "Os", &pystate, &challenge))
+    if (! PyArg_ParseTuple(args, "Os", &pystate, &challenge)) {
         return NULL;
+    }
 
-    if (!PyCObject_Check(pystate)) {
+    if (! PyCObject_Check(pystate)) {
         PyErr_SetString(PyExc_TypeError, "Expected a context object");
         return NULL;
     }
 
     state = (gss_client_state *)PyCObject_AsVoidPtr(pystate);
-    if (state == NULL)
+
+    if (state == NULL) {
         return NULL;
+    }
 
     result = authenticate_gss_client_step(state, challenge);
-    if (result == AUTH_GSS_ERROR)
+
+    if (result == AUTH_GSS_ERROR) {
         return NULL;
+    }
 
     return Py_BuildValue("i", result);
 }
@@ -206,17 +227,20 @@
     gss_client_state *state;
     PyObject *pystate;
 
-    if (!PyArg_ParseTuple(args, "O", &pystate))
+    if (! PyArg_ParseTuple(args, "O", &pystate)) {
         return NULL;
+    }
 
-    if (!PyCObject_Check(pystate)) {
+    if (! PyCObject_Check(pystate)) {
         PyErr_SetString(PyExc_TypeError, "Expected a context object");
         return NULL;
     }
 
     state = (gss_client_state *)PyCObject_AsVoidPtr(pystate);
-    if (state == NULL)
+
+    if (state == NULL) {
         return NULL;
+    }
 
     return Py_BuildValue("i", state->responseConf);
 }
@@ -226,17 +250,20 @@
     gss_server_state *state;
     PyObject *pystate;
 
-    if (!PyArg_ParseTuple(args, "O", &pystate))
+    if (! PyArg_ParseTuple(args, "O", &pystate)) {
         return NULL;
+    }
 
-    if (!PyCObject_Check(pystate)) {
+    if (! PyCObject_Check(pystate)) {
         PyErr_SetString(PyExc_TypeError, "Expected a context object");
         return NULL;
     }
 
     state = (gss_server_state *)PyCObject_AsVoidPtr(pystate);
-    if (state == NULL)
+
+    if (state == NULL) {
         return NULL;
+    }
 
     return PyBool_FromLong(authenticate_gss_server_has_delegated(state));
 }
@@ -246,17 +273,20 @@
     gss_client_state *state;
     PyObject *pystate;
 
-    if (!PyArg_ParseTuple(args, "O", &pystate))
+    if (! PyArg_ParseTuple(args, "O", &pystate)) {
         return NULL;
+    }
 
-    if (!PyCObject_Check(pystate)) {
+    if (! PyCObject_Check(pystate)) {
         PyErr_SetString(PyExc_TypeError, "Expected a context object");
         return NULL;
     }
 
     state = (gss_client_state *)PyCObject_AsVoidPtr(pystate);
-    if (state == NULL)
+
+    if (state == NULL) {
         return NULL;
+    }
 
     return Py_BuildValue("s", state->response);
 }
@@ -266,17 +296,20 @@
     gss_client_state *state;
     PyObject *pystate;
 
-    if (!PyArg_ParseTuple(args, "O", &pystate))
+    if (! PyArg_ParseTuple(args, "O", &pystate)) {
         return NULL;
+    }
 
-    if (!PyCObject_Check(pystate)) {
+    if (! PyCObject_Check(pystate)) {
         PyErr_SetString(PyExc_TypeError, "Expected a context object");
         return NULL;
     }
 
     state = (gss_client_state *)PyCObject_AsVoidPtr(pystate);
-    if (state == NULL)
+
+    if (state == NULL) {
         return NULL;
+    }
 
     return Py_BuildValue("s", state->username);
 }
@@ -288,21 +321,26 @@
 	char *challenge = NULL;
 	int result = 0;
 
-	if (!PyArg_ParseTuple(args, "Os", &pystate, &challenge))
+	if (! PyArg_ParseTuple(args, "Os", &pystate, &challenge)) {
 		return NULL;
+    }
 
-	if (!PyCObject_Check(pystate)) {
+	if (! PyCObject_Check(pystate)) {
 		PyErr_SetString(PyExc_TypeError, "Expected a context object");
 		return NULL;
 	}
 
 	state = (gss_client_state *)PyCObject_AsVoidPtr(pystate);
-	if (state == NULL)
+
+	if (state == NULL) {
 		return NULL;
+    }
 
 	result = authenticate_gss_client_unwrap(state, challenge);
-	if (result == AUTH_GSS_ERROR)
+
+	if (result == AUTH_GSS_ERROR) {
 		return NULL;
+    }
 
 	return Py_BuildValue("i", result);
 }
@@ -316,21 +354,28 @@
 	int protect = 0;
 	int result = 0;
 
-	if (!PyArg_ParseTuple(args, "Os|zi", &pystate, &challenge, &user, &protect))
+	if (! PyArg_ParseTuple(
+        args, "Os|zi", &pystate, &challenge, &user, &protect
+    )) {
 		return NULL;
+    }
 
-	if (!PyCObject_Check(pystate)) {
+	if (! PyCObject_Check(pystate)) {
 		PyErr_SetString(PyExc_TypeError, "Expected a context object");
 		return NULL;
 	}
 
 	state = (gss_client_state *)PyCObject_AsVoidPtr(pystate);
-	if (state == NULL)
+
+	if (state == NULL) {
 		return NULL;
+    }
 
 	result = authenticate_gss_client_wrap(state, challenge, user, protect);
-	if (result == AUTH_GSS_ERROR)
+
+	if (result == AUTH_GSS_ERROR) {
 		return NULL;
+    }
 
 	return Py_BuildValue("i", result);
 }
@@ -342,15 +387,18 @@
     PyObject *pystate;
     int result = 0;
 
-    if (!PyArg_ParseTuple(args, "s", &service))
+    if (! PyArg_ParseTuple(args, "s", &service)) {
         return NULL;
+    }
 
     state = (gss_server_state *) malloc(sizeof(gss_server_state));
     pystate = PyCObject_FromVoidPtr(state, NULL);
 
     result = authenticate_gss_server_init(service, state);
-    if (result == AUTH_GSS_ERROR)
+
+    if (result == AUTH_GSS_ERROR) {
         return NULL;
+    }
 
     return Py_BuildValue("(iO)", result, pystate);
 }
@@ -361,17 +409,18 @@
     PyObject *pystate;
     int result = 0;
 
-    if (!PyArg_ParseTuple(args, "O", &pystate))
+    if (! PyArg_ParseTuple(args, "O", &pystate)) {
         return NULL;
+    }
 
-    if (!PyCObject_Check(pystate)) {
+    if (! PyCObject_Check(pystate)) {
         PyErr_SetString(PyExc_TypeError, "Expected a context object");
         return NULL;
     }
 
     state = (gss_server_state *)PyCObject_AsVoidPtr(pystate);
-    if (state != NULL)
-    {
+
+    if (state != NULL) {
         result = authenticate_gss_server_clean(state);
 
         free(state);
@@ -388,21 +437,26 @@
     char *challenge = NULL;
     int result = 0;
 
-    if (!PyArg_ParseTuple(args, "Os", &pystate, &challenge))
+    if (! PyArg_ParseTuple(args, "Os", &pystate, &challenge)) {
         return NULL;
+    }
 
-    if (!PyCObject_Check(pystate)) {
+    if (! PyCObject_Check(pystate)) {
         PyErr_SetString(PyExc_TypeError, "Expected a context object");
         return NULL;
     }
 
     state = (gss_server_state *)PyCObject_AsVoidPtr(pystate);
-    if (state == NULL)
+
+    if (state == NULL) {
         return NULL;
+    }
 
     result = authenticate_gss_server_step(state, challenge);
-    if (result == AUTH_GSS_ERROR)
+
+    if (result == AUTH_GSS_ERROR) {
         return NULL;
+    }
 
     return Py_BuildValue("i", result);
 }
@@ -413,21 +467,26 @@
     PyObject *pystate;
     int result = 0;
 
-    if (!PyArg_ParseTuple(args, "O", &pystate))
+    if (! PyArg_ParseTuple(args, "O", &pystate)) {
         return NULL;
+    }
 
-    if (!PyCObject_Check(pystate)) {
+    if (! PyCObject_Check(pystate)) {
         PyErr_SetString(PyExc_TypeError, "Expected a context object");
         return NULL;
     }
 
     state = (gss_server_state *)PyCObject_AsVoidPtr(pystate);
-    if (state == NULL)
+
+    if (state == NULL) {
         return NULL;
+    }
 
     result = authenticate_gss_server_store_delegate(state);
-    if (result == AUTH_GSS_ERROR)
+
+    if (result == AUTH_GSS_ERROR) {
         return NULL;
+    }
     
     return Py_BuildValue("i", result);
 }
@@ -437,17 +496,20 @@
     gss_server_state *state;
     PyObject *pystate;
 
-    if (!PyArg_ParseTuple(args, "O", &pystate))
+    if (! PyArg_ParseTuple(args, "O", &pystate)) {
         return NULL;
+    }
 
-    if (!PyCObject_Check(pystate)) {
+    if (! PyCObject_Check(pystate)) {
         PyErr_SetString(PyExc_TypeError, "Expected a context object");
         return NULL;
     }
 
     state = (gss_server_state *)PyCObject_AsVoidPtr(pystate);
-    if (state == NULL)
+
+    if (state == NULL) {
         return NULL;
+    }
 
     return Py_BuildValue("s", state->response);
 }
@@ -457,17 +519,20 @@
     gss_server_state *state;
     PyObject *pystate;
     
-    if (!PyArg_ParseTuple(args, "O", &pystate))
+    if (! PyArg_ParseTuple(args, "O", &pystate)) {
         return NULL;
+    }
     
-    if (!PyCObject_Check(pystate)) {
+    if (! PyCObject_Check(pystate)) {
         PyErr_SetString(PyExc_TypeError, "Expected a context object");
         return NULL;
     }
     
     state = (gss_server_state *)PyCObject_AsVoidPtr(pystate);
-    if (state == NULL)
+
+    if (state == NULL) {
         return NULL;
+    }
     
     return Py_BuildValue("s", state->username);
 }
@@ -477,18 +542,21 @@
     gss_server_state *state;
     PyObject *pystate;
     
-    if (!PyArg_ParseTuple(args, "O", &pystate))
+    if (! PyArg_ParseTuple(args, "O", &pystate)) {
         return NULL;
+    }
     
-    if (!PyCObject_Check(pystate)) {
+    if (! PyCObject_Check(pystate)) {
         PyErr_SetString(PyExc_TypeError, "Expected a context object");
         return NULL;
     }
     
     state = (gss_server_state *)PyCObject_AsVoidPtr(pystate);
-    if (state == NULL)
+
+    if (state == NULL) {
         return NULL;
-    
+    }
+
     return Py_BuildValue("s", state->ccname);
 }
 
@@ -497,62 +565,125 @@
     gss_server_state *state;
     PyObject *pystate;
     
-    if (!PyArg_ParseTuple(args, "O", &pystate))
+    if (! PyArg_ParseTuple(args, "O", &pystate)) {
         return NULL;
+    }
     
-    if (!PyCObject_Check(pystate)) {
+    if (! PyCObject_Check(pystate)) {
         PyErr_SetString(PyExc_TypeError, "Expected a context object");
         return NULL;
     }
     
     state = (gss_server_state *)PyCObject_AsVoidPtr(pystate);
-    if (state == NULL)
+
+    if (state == NULL) {
         return NULL;
+    }
     
     return Py_BuildValue("s", state->targetname);
 }
 
 static PyMethodDef KerberosMethods[] = {
-    {"checkPassword",  checkPassword, METH_VARARGS,
-     "Check the supplied user/password against Kerberos KDC."},
-    {"changePassword",  changePassword, METH_VARARGS,
-     "Change the user password."},
-    {"getServerPrincipalDetails",  getServerPrincipalDetails, METH_VARARGS,
-     "Return the service principal for a given service and hostname."},
-    {"authGSSClientInit",  (PyCFunction)authGSSClientInit, METH_VARARGS | METH_KEYWORDS,
-     "Initialize client-side GSSAPI operations."},
-    {"authGSSClientClean",  authGSSClientClean, METH_VARARGS,
-     "Terminate client-side GSSAPI operations."},
-    {"authGSSClientStep",  authGSSClientStep, METH_VARARGS,
-     "Do a client-side GSSAPI step."},
-    {"authGSSClientResponse",  authGSSClientResponse, METH_VARARGS,
-     "Get the response from the last client-side GSSAPI step."},
-    {"authGSSClientResponseConf",  authGSSClientResponseConf, METH_VARARGS,
-     "return 1 if confidentiality was set in the last unwrapped buffer, 0 otherwise."},
-    {"authGSSClientUserName",  authGSSClientUserName, METH_VARARGS,
-     "Get the user name from the last client-side GSSAPI step."},
-    {"authGSSServerInit",  authGSSServerInit, METH_VARARGS,
-     "Initialize server-side GSSAPI operations."},
-    {"authGSSClientWrap",  authGSSClientWrap, METH_VARARGS,
-     "Do a GSSAPI wrap."},
-    {"authGSSClientUnwrap",  authGSSClientUnwrap, METH_VARARGS,
-     "Do a GSSAPI unwrap."},
-    {"authGSSServerClean",  authGSSServerClean, METH_VARARGS,
-     "Terminate server-side GSSAPI operations."},
-    {"authGSSServerStep",  authGSSServerStep, METH_VARARGS,
-     "Do a server-side GSSAPI step."},
-    {"authGSSServerHasDelegated",  authGSSServerHasDelegated, METH_VARARGS,
-     "Check whether the client delegated credentials to us."},
-     {"authGSSServerStoreDelegate",  authGSSServerStoreDelegate, METH_VARARGS,
-     "Store the delegated Credentials."},
-    {"authGSSServerResponse",  authGSSServerResponse, METH_VARARGS,
-     "Get the response from the last server-side GSSAPI step."},
-    {"authGSSServerUserName",  authGSSServerUserName, METH_VARARGS,
-        "Get the user name from the last server-side GSSAPI step."},
-    {"authGSSServerCacheName",  authGSSServerCacheName, METH_VARARGS,
-        "Get the location of the cache where delegated credentials are stored."},
-    {"authGSSServerTargetName",  authGSSServerTargetName, METH_VARARGS,
-        "Get the target name from the last server-side GSSAPI step."},
+    {
+        "checkPassword",
+        checkPassword, METH_VARARGS,
+        "Check the supplied user/password against Kerberos KDC."
+    },
+    {
+        "changePassword",
+        changePassword, METH_VARARGS,
+        "Change the user password."
+    },
+    {
+        "getServerPrincipalDetails",
+        getServerPrincipalDetails, METH_VARARGS,
+        "Return the service principal for a given service and hostname."
+    },
+    {
+        "authGSSClientInit",
+        (PyCFunction)authGSSClientInit, METH_VARARGS | METH_KEYWORDS,
+        "Initialize client-side GSSAPI operations."
+    },
+    {
+        "authGSSClientClean",
+        authGSSClientClean, METH_VARARGS,
+        "Terminate client-side GSSAPI operations."
+    },
+    {
+        "authGSSClientStep",
+        authGSSClientStep, METH_VARARGS,
+        "Do a client-side GSSAPI step."
+    },
+    {
+        "authGSSClientResponse",
+        authGSSClientResponse, METH_VARARGS,
+        "Get the response from the last client-side GSSAPI step."
+    },
+    {
+        "authGSSClientResponseConf",
+        authGSSClientResponseConf, METH_VARARGS,
+        "return 1 if confidentiality was set in the last unwrapped buffer, 0 otherwise."
+    },
+    {
+        "authGSSClientUserName",
+        authGSSClientUserName, METH_VARARGS,
+        "Get the user name from the last client-side GSSAPI step."
+    },
+    {
+        "authGSSServerInit",
+        authGSSServerInit, METH_VARARGS,
+        "Initialize server-side GSSAPI operations."
+    },
+    {
+        "authGSSClientWrap",
+        authGSSClientWrap, METH_VARARGS,
+        "Do a GSSAPI wrap."
+    },
+    {
+        "authGSSClientUnwrap",
+        authGSSClientUnwrap, METH_VARARGS,
+        "Do a GSSAPI unwrap."
+    },
+    {
+        "authGSSServerClean",
+        authGSSServerClean, METH_VARARGS,
+        "Terminate server-side GSSAPI operations."
+    },
+    {
+        "authGSSServerStep",
+        authGSSServerStep, METH_VARARGS,
+        "Do a server-side GSSAPI step."
+    },
+    {
+        "authGSSServerHasDelegated",
+        authGSSServerHasDelegated, METH_VARARGS,
+        "Check whether the client delegated credentials to us."
+    },
+    {
+        "authGSSServerStoreDelegate",
+        authGSSServerStoreDelegate, METH_VARARGS,
+        "Store the delegated Credentials."
+    },
+    {
+        "authGSSServerResponse",
+        authGSSServerResponse, METH_VARARGS,
+        "Get the response from the last server-side GSSAPI step."
+    },
+    {
+        "authGSSServerUserName",
+        authGSSServerUserName, METH_VARARGS,
+        "Get the user name from the last server-side GSSAPI step."
+    },
+    {
+        "authGSSServerCacheName",
+        authGSSServerCacheName, METH_VARARGS,
+        "Get the location of the cache where delegated credentials are stored."
+    },
+    {
+        "authGSSServerTargetName",
+        authGSSServerTargetName, METH_VARARGS,
+        "Get the target name from the last server-side GSSAPI step."
+    },
     {NULL, NULL, 0, NULL}        /* Sentinel */
 };
 
@@ -562,50 +693,92 @@
 
     MOD_DEF(m, "kerberos", NULL, KerberosMethods);
 
-    if (m == NULL)
+    if (m == NULL) {
         return MOD_ERROR_VAL;
+    }
 
     d = PyModule_GetDict(m);
 
     /* create the base exception class */
-    if (!(KrbException_class = PyErr_NewException("kerberos.KrbError", NULL, NULL)))
+    if (! (KrbException_class = PyErr_NewException(
+        "kerberos.KrbError", NULL, NULL
+    ))) {
         goto error;
+    }
+
     PyDict_SetItemString(d, "KrbError", KrbException_class);
     Py_INCREF(KrbException_class);
 
     /* ...and the derived exceptions */
-    if (!(BasicAuthException_class = PyErr_NewException("kerberos.BasicAuthError", KrbException_class, NULL)))
+    if (! (BasicAuthException_class = PyErr_NewException(
+        "kerberos.BasicAuthError", KrbException_class, NULL
+    ))) {
         goto error;
+    }
+
     Py_INCREF(BasicAuthException_class);
     PyDict_SetItemString(d, "BasicAuthError", BasicAuthException_class);
 
-    if (!(PwdChangeException_class = PyErr_NewException("kerberos.PwdChangeError", KrbException_class, NULL)))
+    if (! (PwdChangeException_class = PyErr_NewException(
+        "kerberos.PwdChangeError", KrbException_class, NULL
+    ))) {
         goto error;
+    }
+
     Py_INCREF(PwdChangeException_class);
     PyDict_SetItemString(d, "PwdChangeError", PwdChangeException_class);
 
-    if (!(GssException_class = PyErr_NewException("kerberos.GSSError", KrbException_class, NULL)))
+    if (! (GssException_class = PyErr_NewException(
+        "kerberos.GSSError", KrbException_class, NULL
+    ))) {
         goto error;
+    }
+
     Py_INCREF(GssException_class);
-    PyDict_SetItemString(d, "GSSError", GssException_class);
+    PyDict_SetItemString(
+        d, "GSSError", GssException_class
+    );
 
-    PyDict_SetItemString(d, "AUTH_GSS_COMPLETE", PyInt_FromLong(AUTH_GSS_COMPLETE));
-    PyDict_SetItemString(d, "AUTH_GSS_CONTINUE", PyInt_FromLong(AUTH_GSS_CONTINUE));
+    PyDict_SetItemString(
+        d, "AUTH_GSS_COMPLETE", PyInt_FromLong(AUTH_GSS_COMPLETE)
+    );
+    PyDict_SetItemString(
+        d, "AUTH_GSS_CONTINUE", PyInt_FromLong(AUTH_GSS_CONTINUE)
+    );
 
-    PyDict_SetItemString(d, "GSS_C_DELEG_FLAG", PyInt_FromLong(GSS_C_DELEG_FLAG));
-    PyDict_SetItemString(d, "GSS_C_MUTUAL_FLAG", PyInt_FromLong(GSS_C_MUTUAL_FLAG));
-    PyDict_SetItemString(d, "GSS_C_REPLAY_FLAG", PyInt_FromLong(GSS_C_REPLAY_FLAG));
-    PyDict_SetItemString(d, "GSS_C_SEQUENCE_FLAG", PyInt_FromLong(GSS_C_SEQUENCE_FLAG));
-    PyDict_SetItemString(d, "GSS_C_CONF_FLAG", PyInt_FromLong(GSS_C_CONF_FLAG));
-    PyDict_SetItemString(d, "GSS_C_INTEG_FLAG", PyInt_FromLong(GSS_C_INTEG_FLAG));
-    PyDict_SetItemString(d, "GSS_C_ANON_FLAG", PyInt_FromLong(GSS_C_ANON_FLAG));
-    PyDict_SetItemString(d, "GSS_C_PROT_READY_FLAG", PyInt_FromLong(GSS_C_PROT_READY_FLAG));
-    PyDict_SetItemString(d, "GSS_C_TRANS_FLAG", PyInt_FromLong(GSS_C_TRANS_FLAG));
+    PyDict_SetItemString(
+        d, "GSS_C_DELEG_FLAG", PyInt_FromLong(GSS_C_DELEG_FLAG)
+    );
+    PyDict_SetItemString(
+        d, "GSS_C_MUTUAL_FLAG", PyInt_FromLong(GSS_C_MUTUAL_FLAG)
+    );
+    PyDict_SetItemString(
+        d, "GSS_C_REPLAY_FLAG", PyInt_FromLong(GSS_C_REPLAY_FLAG)
+    );
+    PyDict_SetItemString(
+        d, "GSS_C_SEQUENCE_FLAG", PyInt_FromLong(GSS_C_SEQUENCE_FLAG)
+    );
+    PyDict_SetItemString(
+        d, "GSS_C_CONF_FLAG", PyInt_FromLong(GSS_C_CONF_FLAG)
+    );
+    PyDict_SetItemString(
+        d, "GSS_C_INTEG_FLAG", PyInt_FromLong(GSS_C_INTEG_FLAG)
+    );
+    PyDict_SetItemString(
+        d, "GSS_C_ANON_FLAG", PyInt_FromLong(GSS_C_ANON_FLAG)
+    );
+    PyDict_SetItemString(
+        d, "GSS_C_PROT_READY_FLAG", PyInt_FromLong(GSS_C_PROT_READY_FLAG)
+    );
+    PyDict_SetItemString(
+        d, "GSS_C_TRANS_FLAG", PyInt_FromLong(GSS_C_TRANS_FLAG)
+    );
 
 error:
     if (PyErr_Occurred()) {
          PyErr_SetString(PyExc_ImportError, "kerberos: init failed");
         return MOD_ERROR_VAL;
     }
+
     return MOD_SUCCESS_VAL(m);
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20150326/4c8777a3/attachment-0001.html>


More information about the calendarserver-changes mailing list