Skip to content

Merge upstream PRs manually #1

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

Merged
tucked merged 3 commits into from
Mar 31, 2021
Merged

Merge upstream PRs manually #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b89b18
build one package with two extensions
twAlexM Jul 9, 2018
12de82a
added METH_VARARGS to PyKAdminPrincipal_modify in PyKAdminPrincipal_m…
Apr 17, 2020
fec2d33
Merge remote-tracking branch 'ualberta-iapps/master' into tmp
tucked Mar 31, 2021
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
29 changes: 2 additions & 27 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,32 +41,7 @@
"src/getdate.c"
],
#extra_compile_args=["-O0"]
)
],
classifiers=[
"Development Status :: 4 - Beta",
"Environment :: Console",
"Intended Audience :: System Administrators",
"Intended Audience :: Developers",
"Operating System :: POSIX",
"Programming Language :: C",
"Programming Language :: Python",
"Programming Language :: YACC",
"License :: OSI Approved :: MIT License",
"Topic :: Software Development :: Libraries :: Python Modules",
"Topic :: System :: Systems Administration :: Authentication/Directory",
]
)

setup(name='python-kadmin-local',
version='0.1.1',
description='Python module for kerberos admin (kadm5) via root local interface',
url='https://github.com/russjancewicz/python-kadmin',
download_url='https://github.com/russjancewicz/python-kadmin/tarball/v0.1.1',
author='Russell Jancewicz',
author_email='russell.jancewicz@gmail.com',
license='MIT',
ext_modules=[
),
Extension(
"kadmin_local",
libraries=["krb5", "kadm5srv", "kdb5"],
Expand All @@ -84,6 +59,7 @@
],
define_macros=[('KADMIN_LOCAL', '')]
)

],
classifiers=[
"Development Status :: 4 - Beta",
Expand All @@ -99,4 +75,3 @@
"Topic :: System :: Systems Administration :: Authentication/Directory",
]
)

2 changes: 1 addition & 1 deletion src/PyKAdminPrincipalObject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -954,7 +954,7 @@ static PyMethodDef PyKAdminPrincipal_methods[] = {
{"randkey", (PyCFunction)PyKAdminPrincipal_randomize_key, METH_NOARGS, kDOCSTRING_RANDKEY},
{"randomize_key", (PyCFunction)PyKAdminPrincipal_randomize_key, METH_NOARGS, kDOCSTRING_RANDKEY},

{"modify", (PyCFunction)PyKAdminPrincipal_modify, METH_KEYWORDS, kDOCSTRING_MODIFY},
{"modify", (PyCFunction)PyKAdminPrincipal_modify, METH_VARARGS | METH_KEYWORDS, kDOCSTRING_MODIFY},

{"commit", (PyCFunction)PyKAdminPrincipal_commit, METH_NOARGS, kDOCSTRING_COMMIT},
{"reload", (PyCFunction)PyKAdminPrincipal_reload, METH_NOARGS, kDOCSTRING_RELOAD},
Expand Down