Recorded merge of revisions 81029 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r81029 | antoine.pitrou | 2010-05-09 16:46:46 +0200 (dim., 09 mai 2010) | 3 lines
Untabify C files. Will watch buildbots.
........
diff --git a/Modules/nismodule.c b/Modules/nismodule.c
index 4be4657..16c7b81 100644
--- a/Modules/nismodule.c
+++ b/Modules/nismodule.c
@@ -1,11 +1,11 @@
/***********************************************************
Written by:
- Fred Gansevles <Fred.Gansevles@cs.utwente.nl>
- B&O group,
- Faculteit der Informatica,
- Universiteit Twente,
- Enschede,
- the Netherlands.
+ Fred Gansevles <Fred.Gansevles@cs.utwente.nl>
+ B&O group,
+ Faculteit der Informatica,
+ Universiteit Twente,
+ Enschede,
+ the Netherlands.
******************************************************************/
/* NIS module implementation */
@@ -23,7 +23,7 @@
extern int yp_get_default_domain(char **);
#endif
-PyDoc_STRVAR(get_default_domain__doc__,
+PyDoc_STRVAR(get_default_domain__doc__,
"get_default_domain() -> str\n\
Corresponds to the C library yp_get_default_domain() call, returning\n\
the default NIS domain.\n");
@@ -49,44 +49,44 @@
static PyObject *
nis_error (int err)
{
- PyErr_SetString(NisError, yperr_string(err));
- return NULL;
+ PyErr_SetString(NisError, yperr_string(err));
+ return NULL;
}
static struct nis_map {
- char *alias;
- char *map;
- int fix;
+ char *alias;
+ char *map;
+ int fix;
} aliases [] = {
- {"passwd", "passwd.byname", 0},
- {"group", "group.byname", 0},
- {"networks", "networks.byaddr", 0},
- {"hosts", "hosts.byname", 0},
- {"protocols", "protocols.bynumber", 0},
- {"services", "services.byname", 0},
- {"aliases", "mail.aliases", 1}, /* created with 'makedbm -a' */
- {"ethers", "ethers.byname", 0},
- {0L, 0L, 0}
+ {"passwd", "passwd.byname", 0},
+ {"group", "group.byname", 0},
+ {"networks", "networks.byaddr", 0},
+ {"hosts", "hosts.byname", 0},
+ {"protocols", "protocols.bynumber", 0},
+ {"services", "services.byname", 0},
+ {"aliases", "mail.aliases", 1}, /* created with 'makedbm -a' */
+ {"ethers", "ethers.byname", 0},
+ {0L, 0L, 0}
};
static char *
nis_mapname (char *map, int *pfix)
{
- int i;
+ int i;
- *pfix = 0;
- for (i=0; aliases[i].alias != 0L; i++) {
- if (!strcmp (aliases[i].alias, map)) {
- *pfix = aliases[i].fix;
- return aliases[i].map;
- }
- if (!strcmp (aliases[i].map, map)) {
- *pfix = aliases[i].fix;
- return aliases[i].map;
- }
- }
+ *pfix = 0;
+ for (i=0; aliases[i].alias != 0L; i++) {
+ if (!strcmp (aliases[i].alias, map)) {
+ *pfix = aliases[i].fix;
+ return aliases[i].map;
+ }
+ if (!strcmp (aliases[i].map, map)) {
+ *pfix = aliases[i].fix;
+ return aliases[i].map;
+ }
+ }
- return map;
+ return map;
}
#if defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__)
@@ -96,168 +96,168 @@
#endif
struct ypcallback_data {
- PyObject *dict;
- int fix;
- PyThreadState *state;
+ PyObject *dict;
+ int fix;
+ PyThreadState *state;
};
static int
nis_foreach (int instatus, char *inkey, int inkeylen, char *inval,
int invallen, struct ypcallback_data *indata)
{
- if (instatus == YP_TRUE) {
- PyObject *key;
- PyObject *val;
- int err;
+ if (instatus == YP_TRUE) {
+ PyObject *key;
+ PyObject *val;
+ int err;
- PyEval_RestoreThread(indata->state);
- if (indata->fix) {
- if (inkeylen > 0 && inkey[inkeylen-1] == '\0')
- inkeylen--;
- if (invallen > 0 && inval[invallen-1] == '\0')
- invallen--;
- }
- key = PyUnicode_FromStringAndSize(inkey, inkeylen);
- val = PyUnicode_FromStringAndSize(inval, invallen);
- if (key == NULL || val == NULL) {
- /* XXX error -- don't know how to handle */
- PyErr_Clear();
- Py_XDECREF(key);
- Py_XDECREF(val);
- return 1;
- }
- err = PyDict_SetItem(indata->dict, key, val);
- Py_DECREF(key);
- Py_DECREF(val);
- if (err != 0)
- PyErr_Clear();
- indata->state = PyEval_SaveThread();
- if (err != 0)
- return 1;
- return 0;
- }
- return 1;
+ PyEval_RestoreThread(indata->state);
+ if (indata->fix) {
+ if (inkeylen > 0 && inkey[inkeylen-1] == '\0')
+ inkeylen--;
+ if (invallen > 0 && inval[invallen-1] == '\0')
+ invallen--;
+ }
+ key = PyUnicode_FromStringAndSize(inkey, inkeylen);
+ val = PyUnicode_FromStringAndSize(inval, invallen);
+ if (key == NULL || val == NULL) {
+ /* XXX error -- don't know how to handle */
+ PyErr_Clear();
+ Py_XDECREF(key);
+ Py_XDECREF(val);
+ return 1;
+ }
+ err = PyDict_SetItem(indata->dict, key, val);
+ Py_DECREF(key);
+ Py_DECREF(val);
+ if (err != 0)
+ PyErr_Clear();
+ indata->state = PyEval_SaveThread();
+ if (err != 0)
+ return 1;
+ return 0;
+ }
+ return 1;
}
static PyObject *
nis_get_default_domain (PyObject *self)
{
- char *domain;
- int err;
- PyObject *res;
+ char *domain;
+ int err;
+ PyObject *res;
- if ((err = yp_get_default_domain(&domain)) != 0)
- return nis_error(err);
+ if ((err = yp_get_default_domain(&domain)) != 0)
+ return nis_error(err);
- res = PyUnicode_FromStringAndSize (domain, strlen(domain));
- return res;
+ res = PyUnicode_FromStringAndSize (domain, strlen(domain));
+ return res;
}
static PyObject *
nis_match (PyObject *self, PyObject *args, PyObject *kwdict)
{
- char *match;
- char *domain = NULL;
- int keylen, len;
- char *key, *map;
- int err;
- PyObject *res;
- int fix;
- static char *kwlist[] = {"key", "map", "domain", NULL};
+ char *match;
+ char *domain = NULL;
+ int keylen, len;
+ char *key, *map;
+ int err;
+ PyObject *res;
+ int fix;
+ static char *kwlist[] = {"key", "map", "domain", NULL};
- if (!PyArg_ParseTupleAndKeywords(args, kwdict,
- "s#s|s:match", kwlist,
- &key, &keylen, &map, &domain))
- return NULL;
- if (!domain && ((err = yp_get_default_domain(&domain)) != 0))
- return nis_error(err);
- map = nis_mapname (map, &fix);
- if (fix)
- keylen++;
- Py_BEGIN_ALLOW_THREADS
- err = yp_match (domain, map, key, keylen, &match, &len);
- Py_END_ALLOW_THREADS
- if (fix)
- len--;
- if (err != 0)
- return nis_error(err);
- res = PyUnicode_FromStringAndSize (match, len);
- free (match);
- return res;
+ if (!PyArg_ParseTupleAndKeywords(args, kwdict,
+ "s#s|s:match", kwlist,
+ &key, &keylen, &map, &domain))
+ return NULL;
+ if (!domain && ((err = yp_get_default_domain(&domain)) != 0))
+ return nis_error(err);
+ map = nis_mapname (map, &fix);
+ if (fix)
+ keylen++;
+ Py_BEGIN_ALLOW_THREADS
+ err = yp_match (domain, map, key, keylen, &match, &len);
+ Py_END_ALLOW_THREADS
+ if (fix)
+ len--;
+ if (err != 0)
+ return nis_error(err);
+ res = PyUnicode_FromStringAndSize (match, len);
+ free (match);
+ return res;
}
static PyObject *
nis_cat (PyObject *self, PyObject *args, PyObject *kwdict)
{
- char *domain = NULL;
- char *map;
- struct ypall_callback cb;
- struct ypcallback_data data;
- PyObject *dict;
- int err;
- static char *kwlist[] = {"map", "domain", NULL};
+ char *domain = NULL;
+ char *map;
+ struct ypall_callback cb;
+ struct ypcallback_data data;
+ PyObject *dict;
+ int err;
+ static char *kwlist[] = {"map", "domain", NULL};
- if (!PyArg_ParseTupleAndKeywords(args, kwdict, "s|s:cat",
- kwlist, &map, &domain))
- return NULL;
- if (!domain && ((err = yp_get_default_domain(&domain)) != 0))
- return nis_error(err);
- dict = PyDict_New ();
- if (dict == NULL)
- return NULL;
- cb.foreach = (foreachfunc)nis_foreach;
- data.dict = dict;
- map = nis_mapname (map, &data.fix);
- cb.data = (char *)&data;
- data.state = PyEval_SaveThread();
- err = yp_all (domain, map, &cb);
- PyEval_RestoreThread(data.state);
- if (err != 0) {
- Py_DECREF(dict);
- return nis_error(err);
- }
- return dict;
+ if (!PyArg_ParseTupleAndKeywords(args, kwdict, "s|s:cat",
+ kwlist, &map, &domain))
+ return NULL;
+ if (!domain && ((err = yp_get_default_domain(&domain)) != 0))
+ return nis_error(err);
+ dict = PyDict_New ();
+ if (dict == NULL)
+ return NULL;
+ cb.foreach = (foreachfunc)nis_foreach;
+ data.dict = dict;
+ map = nis_mapname (map, &data.fix);
+ cb.data = (char *)&data;
+ data.state = PyEval_SaveThread();
+ err = yp_all (domain, map, &cb);
+ PyEval_RestoreThread(data.state);
+ if (err != 0) {
+ Py_DECREF(dict);
+ return nis_error(err);
+ }
+ return dict;
}
/* These should be u_long on Sun h/w but not on 64-bit h/w.
This is not portable to machines with 16-bit ints and no prototypes */
#ifndef YPPROC_MAPLIST
-#define YPPROC_MAPLIST 11
+#define YPPROC_MAPLIST 11
#endif
#ifndef YPPROG
-#define YPPROG 100004
+#define YPPROG 100004
#endif
#ifndef YPVERS
-#define YPVERS 2
+#define YPVERS 2
#endif
typedef char *domainname;
typedef char *mapname;
enum nisstat {
- NIS_TRUE = 1,
- NIS_NOMORE = 2,
- NIS_FALSE = 0,
- NIS_NOMAP = -1,
- NIS_NODOM = -2,
- NIS_NOKEY = -3,
- NIS_BADOP = -4,
- NIS_BADDB = -5,
- NIS_YPERR = -6,
- NIS_BADARGS = -7,
- NIS_VERS = -8
+ NIS_TRUE = 1,
+ NIS_NOMORE = 2,
+ NIS_FALSE = 0,
+ NIS_NOMAP = -1,
+ NIS_NODOM = -2,
+ NIS_NOKEY = -3,
+ NIS_BADOP = -4,
+ NIS_BADDB = -5,
+ NIS_YPERR = -6,
+ NIS_BADARGS = -7,
+ NIS_VERS = -8
};
typedef enum nisstat nisstat;
struct nismaplist {
- mapname map;
- struct nismaplist *next;
+ mapname map;
+ struct nismaplist *next;
};
typedef struct nismaplist nismaplist;
struct nisresp_maplist {
- nisstat stat;
- nismaplist *maps;
+ nisstat stat;
+ nismaplist *maps;
};
typedef struct nisresp_maplist nisresp_maplist;
@@ -267,45 +267,45 @@
bool_t
nis_xdr_domainname(XDR *xdrs, domainname *objp)
{
- if (!xdr_string(xdrs, objp, YPMAXDOMAIN)) {
- return (FALSE);
- }
- return (TRUE);
+ if (!xdr_string(xdrs, objp, YPMAXDOMAIN)) {
+ return (FALSE);
+ }
+ return (TRUE);
}
static
bool_t
nis_xdr_mapname(XDR *xdrs, mapname *objp)
{
- if (!xdr_string(xdrs, objp, YPMAXMAP)) {
- return (FALSE);
- }
- return (TRUE);
+ if (!xdr_string(xdrs, objp, YPMAXMAP)) {
+ return (FALSE);
+ }
+ return (TRUE);
}
static
bool_t
nis_xdr_ypmaplist(XDR *xdrs, nismaplist *objp)
{
- if (!nis_xdr_mapname(xdrs, &objp->map)) {
- return (FALSE);
- }
- if (!xdr_pointer(xdrs, (char **)&objp->next,
- sizeof(nismaplist), (xdrproc_t)nis_xdr_ypmaplist))
- {
- return (FALSE);
- }
- return (TRUE);
+ if (!nis_xdr_mapname(xdrs, &objp->map)) {
+ return (FALSE);
+ }
+ if (!xdr_pointer(xdrs, (char **)&objp->next,
+ sizeof(nismaplist), (xdrproc_t)nis_xdr_ypmaplist))
+ {
+ return (FALSE);
+ }
+ return (TRUE);
}
static
bool_t
nis_xdr_ypstat(XDR *xdrs, nisstat *objp)
{
- if (!xdr_enum(xdrs, (enum_t *)objp)) {
- return (FALSE);
- }
- return (TRUE);
+ if (!xdr_enum(xdrs, (enum_t *)objp)) {
+ return (FALSE);
+ }
+ return (TRUE);
}
@@ -313,15 +313,15 @@
bool_t
nis_xdr_ypresp_maplist(XDR *xdrs, nisresp_maplist *objp)
{
- if (!nis_xdr_ypstat(xdrs, &objp->stat)) {
- return (FALSE);
- }
- if (!xdr_pointer(xdrs, (char **)&objp->maps,
- sizeof(nismaplist), (xdrproc_t)nis_xdr_ypmaplist))
- {
- return (FALSE);
- }
- return (TRUE);
+ if (!nis_xdr_ypstat(xdrs, &objp->stat)) {
+ return (FALSE);
+ }
+ if (!xdr_pointer(xdrs, (char **)&objp->maps,
+ sizeof(nismaplist), (xdrproc_t)nis_xdr_ypmaplist))
+ {
+ return (FALSE);
+ }
+ return (TRUE);
}
@@ -329,132 +329,132 @@
nisresp_maplist *
nisproc_maplist_2(domainname *argp, CLIENT *clnt)
{
- static nisresp_maplist res;
+ static nisresp_maplist res;
- memset(&res, 0, sizeof(res));
- if (clnt_call(clnt, YPPROC_MAPLIST,
- (xdrproc_t)nis_xdr_domainname, (caddr_t)argp,
- (xdrproc_t)nis_xdr_ypresp_maplist, (caddr_t)&res,
- TIMEOUT) != RPC_SUCCESS)
- {
- return (NULL);
- }
- return (&res);
+ memset(&res, 0, sizeof(res));
+ if (clnt_call(clnt, YPPROC_MAPLIST,
+ (xdrproc_t)nis_xdr_domainname, (caddr_t)argp,
+ (xdrproc_t)nis_xdr_ypresp_maplist, (caddr_t)&res,
+ TIMEOUT) != RPC_SUCCESS)
+ {
+ return (NULL);
+ }
+ return (&res);
}
static
nismaplist *
nis_maplist (char *dom)
{
- nisresp_maplist *list;
- CLIENT *cl;
- char *server = NULL;
- int mapi = 0;
+ nisresp_maplist *list;
+ CLIENT *cl;
+ char *server = NULL;
+ int mapi = 0;
- while (!server && aliases[mapi].map != 0L) {
- yp_master (dom, aliases[mapi].map, &server);
- mapi++;
- }
- if (!server) {
- PyErr_SetString(NisError, "No NIS master found for any map");
- return NULL;
- }
- cl = clnt_create(server, YPPROG, YPVERS, "tcp");
- if (cl == NULL) {
- PyErr_SetString(NisError, clnt_spcreateerror(server));
- goto finally;
- }
- list = nisproc_maplist_2 (&dom, cl);
- clnt_destroy(cl);
- if (list == NULL)
- goto finally;
- if (list->stat != NIS_TRUE)
- goto finally;
+ while (!server && aliases[mapi].map != 0L) {
+ yp_master (dom, aliases[mapi].map, &server);
+ mapi++;
+ }
+ if (!server) {
+ PyErr_SetString(NisError, "No NIS master found for any map");
+ return NULL;
+ }
+ cl = clnt_create(server, YPPROG, YPVERS, "tcp");
+ if (cl == NULL) {
+ PyErr_SetString(NisError, clnt_spcreateerror(server));
+ goto finally;
+ }
+ list = nisproc_maplist_2 (&dom, cl);
+ clnt_destroy(cl);
+ if (list == NULL)
+ goto finally;
+ if (list->stat != NIS_TRUE)
+ goto finally;
- free(server);
- return list->maps;
+ free(server);
+ return list->maps;
finally:
- free(server);
- return NULL;
+ free(server);
+ return NULL;
}
static PyObject *
nis_maps (PyObject *self, PyObject *args, PyObject *kwdict)
{
- char *domain = NULL;
- nismaplist *maps;
- PyObject *list;
- int err;
- static char *kwlist[] = {"domain", NULL};
+ char *domain = NULL;
+ nismaplist *maps;
+ PyObject *list;
+ int err;
+ static char *kwlist[] = {"domain", NULL};
- if (!PyArg_ParseTupleAndKeywords(args, kwdict,
- "|s:maps", kwlist, &domain))
- return NULL;
- if (!domain && ((err = yp_get_default_domain (&domain)) != 0)) {
- nis_error(err);
- return NULL;
- }
+ if (!PyArg_ParseTupleAndKeywords(args, kwdict,
+ "|s:maps", kwlist, &domain))
+ return NULL;
+ if (!domain && ((err = yp_get_default_domain (&domain)) != 0)) {
+ nis_error(err);
+ return NULL;
+ }
- if ((maps = nis_maplist (domain)) == NULL)
- return NULL;
- if ((list = PyList_New(0)) == NULL)
- return NULL;
- for (maps = maps; maps; maps = maps->next) {
- PyObject *str = PyUnicode_FromString(maps->map);
- if (!str || PyList_Append(list, str) < 0)
- {
- Py_DECREF(list);
- list = NULL;
- break;
- }
- Py_DECREF(str);
- }
- /* XXX Shouldn't we free the list of maps now? */
- return list;
+ if ((maps = nis_maplist (domain)) == NULL)
+ return NULL;
+ if ((list = PyList_New(0)) == NULL)
+ return NULL;
+ for (maps = maps; maps; maps = maps->next) {
+ PyObject *str = PyUnicode_FromString(maps->map);
+ if (!str || PyList_Append(list, str) < 0)
+ {
+ Py_DECREF(list);
+ list = NULL;
+ break;
+ }
+ Py_DECREF(str);
+ }
+ /* XXX Shouldn't we free the list of maps now? */
+ return list;
}
static PyMethodDef nis_methods[] = {
- {"match", (PyCFunction)nis_match,
- METH_VARARGS | METH_KEYWORDS,
- match__doc__},
- {"cat", (PyCFunction)nis_cat,
- METH_VARARGS | METH_KEYWORDS,
- cat__doc__},
- {"maps", (PyCFunction)nis_maps,
- METH_VARARGS | METH_KEYWORDS,
- maps__doc__},
- {"get_default_domain", (PyCFunction)nis_get_default_domain,
- METH_NOARGS,
- get_default_domain__doc__},
- {NULL, NULL} /* Sentinel */
+ {"match", (PyCFunction)nis_match,
+ METH_VARARGS | METH_KEYWORDS,
+ match__doc__},
+ {"cat", (PyCFunction)nis_cat,
+ METH_VARARGS | METH_KEYWORDS,
+ cat__doc__},
+ {"maps", (PyCFunction)nis_maps,
+ METH_VARARGS | METH_KEYWORDS,
+ maps__doc__},
+ {"get_default_domain", (PyCFunction)nis_get_default_domain,
+ METH_NOARGS,
+ get_default_domain__doc__},
+ {NULL, NULL} /* Sentinel */
};
PyDoc_STRVAR(nis__doc__,
"This module contains functions for accessing NIS maps.\n");
static struct PyModuleDef nismodule = {
- PyModuleDef_HEAD_INIT,
- "nis",
- nis__doc__,
- -1,
- nis_methods,
- NULL,
- NULL,
- NULL,
- NULL
+ PyModuleDef_HEAD_INIT,
+ "nis",
+ nis__doc__,
+ -1,
+ nis_methods,
+ NULL,
+ NULL,
+ NULL,
+ NULL
};
PyObject*
PyInit_nis (void)
{
- PyObject *m, *d;
- m = PyModule_Create(&nismodule);
- if (m == NULL)
- return NULL;
- d = PyModule_GetDict(m);
- NisError = PyErr_NewException("nis.error", NULL, NULL);
- if (NisError != NULL)
- PyDict_SetItemString(d, "error", NisError);
- return m;
+ PyObject *m, *d;
+ m = PyModule_Create(&nismodule);
+ if (m == NULL)
+ return NULL;
+ d = PyModule_GetDict(m);
+ NisError = PyErr_NewException("nis.error", NULL, NULL);
+ if (NisError != NULL)
+ PyDict_SetItemString(d, "error", NisError);
+ return m;
}