Skip to content

Bugfix for KAdminPrincipal_set_policy #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Kowh wants to merge 3 commits into from
Closed

Bugfix for KAdminPrincipal_set_policy #6

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f1e8927
Added pwexpire function to set password expiration dates
Apr 11, 2014
d59c416
Bugfix: Memory wasn't being allocated for policy name string
Jun 17, 2014
d965b80
Bugfix: Don't free self->entry on dealloc, python autofrees it
Jun 18, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 28 additions & 2 deletions PyKAdminPrincipalObject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#define IS_NULL(ptr) (ptr == NULL)

static void KAdminPrincipal_dealloc(PyKAdminPrincipalObject *self) {

kadm5_free_principal_ent(self->kadmin->server_handle, &self->entry);

Py_XDECREF(self->kadmin);
Expand Down Expand Up @@ -101,6 +101,25 @@ static PyObject *KAdminPrincipal_set_expire(PyKAdminPrincipalObject *self, PyObj
Py_RETURN_TRUE;
}

static PyObject *KAdminPrincipal_set_pwexpire(PyKAdminPrincipalObject *self, PyObject *args, PyObject *kwds) {

kadm5_ret_t retval;
time_t date = 0;
char *expire = NULL;

if (!PyArg_ParseTuple(args, "s", &expire))
return NULL;

date = get_date(expire);

self->entry.pw_expiration = date;

retval = kadm5_modify_principal(self->kadmin->server_handle, &self->entry, KADM5_PW_EXPIRATION);
if (retval != 0x0) { PyKAdmin_RaiseKAdminError(retval, "kadm5_modify_principal"); return NULL; }

Py_RETURN_TRUE;
}

static PyObject *KAdminPrincipal_set_policy(PyKAdminPrincipalObject *self, PyObject *args, PyObject *kwds) {

kadm5_ret_t retval;
Expand All @@ -109,7 +128,13 @@ static PyObject *KAdminPrincipal_set_policy(PyKAdminPrincipalObject *self, PyObj
if (!PyArg_ParseTuple(args, "s", &policy))
return NULL;

strcpy(self->entry.policy, policy);
// If we already allocated a policy string, free it
if (self->entry.policy != NULL) {
free(self->entry.policy);
}

// Copy the string so we can use it after Python frees it
self->entry.policy = strdup(policy);

retval = kadm5_modify_principal(self->kadmin->server_handle, &self->entry, KADM5_POLICY);
if (retval != 0x0) { PyKAdmin_RaiseKAdminError(retval, "kadm5_modify_principal"); return NULL; }
Expand Down Expand Up @@ -227,6 +252,7 @@ static PyMethodDef KAdminPrincipal_methods[] = {
{"randomize_key", (PyCFunction)KAdminPrincipal_randomize_key, METH_VARARGS, ""},

{"expire", (PyCFunction)KAdminPrincipal_set_expire, METH_VARARGS, ""},
{"pwexpire", (PyCFunction)KAdminPrincipal_set_pwexpire, METH_VARARGS, ""},
{"set_policy", (PyCFunction)KAdminPrincipal_set_policy, METH_VARARGS, ""},
{"clear_policy", (PyCFunction)KAdminPrincipal_clear_policy, METH_VARARGS, ""},

Expand Down