summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
Diffstat (limited to 'source4')
-rw-r--r--source4/auth/gensec/pygensec.c2
-rw-r--r--source4/dsdb/pydsdb.c20
-rw-r--r--source4/lib/policy/pypolicy.c4
-rw-r--r--source4/lib/registry/pyregistry.c4
-rw-r--r--source4/libnet/py_net.c2
-rw-r--r--source4/librpc/ndr/py_lsa.c6
-rw-r--r--source4/librpc/ndr/py_misc.c2
-rw-r--r--source4/librpc/ndr/py_security.c6
-rw-r--r--source4/librpc/rpc/pyrpc.c2
-rw-r--r--source4/librpc/rpc/pyrpc_util.c2
-rw-r--r--source4/param/provision.c42
-rw-r--r--source4/param/pyparam.c32
12 files changed, 62 insertions, 62 deletions
diff --git a/source4/auth/gensec/pygensec.c b/source4/auth/gensec/pygensec.c
index c62d2be081e..8996ac2bc33 100644
--- a/source4/auth/gensec/pygensec.c
+++ b/source4/auth/gensec/pygensec.c
@@ -45,7 +45,7 @@ static PyObject *py_get_name_by_authtype(PyObject *self, PyObject *args)
if (name == NULL)
Py_RETURN_NONE;
- return PyStr_FromString(name);
+ return PyUnicode_FromString(name);
}
static struct gensec_settings *settings_from_object(TALLOC_CTX *mem_ctx, PyObject *object)
diff --git a/source4/dsdb/pydsdb.c b/source4/dsdb/pydsdb.c
index 255ec656330..11b19c6499c 100644
--- a/source4/dsdb/pydsdb.c
+++ b/source4/dsdb/pydsdb.c
@@ -97,7 +97,7 @@ static PyObject *py_samdb_server_site_name(PyObject *self, PyObject *args)
return NULL;
}
- result = PyStr_FromString(site);
+ result = PyUnicode_FromString(site);
talloc_free(mem_ctx);
return result;
}
@@ -123,7 +123,7 @@ static PyObject *py_dsdb_convert_schema_to_openldap(PyObject *self,
return NULL;
}
- ret = PyStr_FromString(retstr);
+ ret = PyUnicode_FromString(retstr);
talloc_free(retstr);
return ret;
}
@@ -208,7 +208,7 @@ static PyObject *py_samdb_get_domain_sid(PyLdbObject *self, PyObject *args)
return NULL;
}
- ret = PyStr_FromString(dom_sid_str_buf(sid, &buf));
+ ret = PyUnicode_FromString(dom_sid_str_buf(sid, &buf));
return ret;
}
@@ -237,7 +237,7 @@ static PyObject *py_samdb_ntds_invocation_id(PyObject *self, PyObject *args)
PyErr_NoMemory();
return NULL;
}
- result = PyStr_FromString(retstr);
+ result = PyUnicode_FromString(retstr);
talloc_free(retstr);
return result;
}
@@ -279,7 +279,7 @@ static PyObject *py_dsdb_get_oid_from_attid(PyObject *self, PyObject *args)
return NULL;
}
- ret = PyStr_FromString(oid);
+ ret = PyUnicode_FromString(oid);
talloc_free(mem_ctx);
@@ -434,7 +434,7 @@ static PyObject *py_dsdb_get_backlink_from_lDAPDisplayName(PyObject *self, PyObj
Py_RETURN_NONE;
}
- return PyStr_FromString(target_attr->lDAPDisplayName);
+ return PyUnicode_FromString(target_attr->lDAPDisplayName);
}
@@ -464,7 +464,7 @@ static PyObject *py_dsdb_get_lDAPDisplayName_by_attid(PyObject *self, PyObject *
return NULL;
}
- return PyStr_FromString(a->lDAPDisplayName);
+ return PyUnicode_FromString(a->lDAPDisplayName);
}
@@ -497,7 +497,7 @@ static PyObject *py_dsdb_get_syntax_oid_from_lDAPDisplayName(PyObject *self, PyO
return NULL;
}
- return PyStr_FromString(attribute->syntax->ldap_oid);
+ return PyUnicode_FromString(attribute->syntax->ldap_oid);
}
/*
@@ -821,7 +821,7 @@ static PyObject *py_samdb_ntds_objectGUID(PyObject *self, PyObject *args)
PyErr_NoMemory();
return NULL;
}
- result = PyStr_FromString(retstr);
+ result = PyUnicode_FromString(retstr);
talloc_free(retstr);
return result;
}
@@ -1656,7 +1656,7 @@ MODULE_INIT_FUNC(dsdb)
ADD_DSDB_FLAG(GPO_INHERIT);
ADD_DSDB_FLAG(GPO_BLOCK_INHERITANCE);
-#define ADD_DSDB_STRING(val) PyModule_AddObject(m, #val, PyStr_FromString(val))
+#define ADD_DSDB_STRING(val) PyModule_AddObject(m, #val, PyUnicode_FromString(val))
ADD_DSDB_STRING(DSDB_SYNTAX_BINARY_DN);
ADD_DSDB_STRING(DSDB_SYNTAX_STRING_DN);
diff --git a/source4/lib/policy/pypolicy.c b/source4/lib/policy/pypolicy.c
index 0e8c89fd58b..038fa0428c3 100644
--- a/source4/lib/policy/pypolicy.c
+++ b/source4/lib/policy/pypolicy.c
@@ -53,7 +53,7 @@ static PyObject *py_get_gpo_flags(PyObject *self, PyObject *args)
py_ret = PyList_New(0);
for (i = 0; ret[i]; i++) {
int res = 0;
- PyObject *item = PyStr_FromString(ret[i]);
+ PyObject *item = PyUnicode_FromString(ret[i]);
if (item == NULL) {
talloc_free(mem_ctx);
Py_DECREF(py_ret);
@@ -102,7 +102,7 @@ static PyObject *py_get_gplink_options(PyObject *self, PyObject *args)
py_ret = PyList_New(0);
for (i = 0; ret[i]; i++) {
int res = 0;
- PyObject *item = PyStr_FromString(ret[i]);
+ PyObject *item = PyUnicode_FromString(ret[i]);
if (item == NULL) {
talloc_free(mem_ctx);
Py_DECREF(py_ret);
diff --git a/source4/lib/registry/pyregistry.c b/source4/lib/registry/pyregistry.c
index 5da804fb048..daa9ba903c2 100644
--- a/source4/lib/registry/pyregistry.c
+++ b/source4/lib/registry/pyregistry.c
@@ -417,7 +417,7 @@ static PyObject *py_str_regtype(PyObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "i", &regtype))
return NULL;
- return PyStr_FromString(str_regtype(regtype));
+ return PyUnicode_FromString(str_regtype(regtype));
}
static PyObject *py_get_predef_name(PyObject *self, PyObject *args)
@@ -431,7 +431,7 @@ static PyObject *py_get_predef_name(PyObject *self, PyObject *args)
str = reg_get_predef_name(hkey);
if (str == NULL)
Py_RETURN_NONE;
- return PyStr_FromString(str);
+ return PyUnicode_FromString(str);
}
static PyMethodDef py_registry_methods[] = {
diff --git a/source4/libnet/py_net.c b/source4/libnet/py_net.c
index 5beeeab1fa8..25a25b0cfd1 100644
--- a/source4/libnet/py_net.c
+++ b/source4/libnet/py_net.c
@@ -325,7 +325,7 @@ static PyObject *py_net_time(py_net_Object *self, PyObject *args, PyObject *kwar
tm = localtime(&r.generic.out.time);
strftime(timestr, sizeof(timestr)-1, "%c %Z",tm);
- ret = PyStr_FromString(timestr);
+ ret = PyUnicode_FromString(timestr);
talloc_free(mem_ctx);
diff --git a/source4/librpc/ndr/py_lsa.c b/source4/librpc/ndr/py_lsa.c
index f9857a56957..fe01de36fea 100644
--- a/source4/librpc/ndr/py_lsa.c
+++ b/source4/librpc/ndr/py_lsa.c
@@ -26,9 +26,9 @@ static PyObject *py_lsa_String_str(PyObject *py_self)
PyObject *ret = NULL;
if (self->string == NULL) {
const char *empty = "";
- ret = PyStr_FromString(empty);
+ ret = PyUnicode_FromString(empty);
} else {
- ret = PyStr_FromString(self->string);
+ ret = PyUnicode_FromString(self->string);
}
return ret;
}
@@ -39,7 +39,7 @@ static PyObject *py_lsa_String_repr(PyObject *py_self)
PyObject *ret = NULL;
if (self->string == NULL) {
const char *empty = "lsaString(None)";
- ret = PyStr_FromString(empty);
+ ret = PyUnicode_FromString(empty);
} else {
ret = PyStr_FromFormat("lsaString('%s')", self->string);
}
diff --git a/source4/librpc/ndr/py_misc.c b/source4/librpc/ndr/py_misc.c
index 187fdb784cf..5e6af484f26 100644
--- a/source4/librpc/ndr/py_misc.c
+++ b/source4/librpc/ndr/py_misc.c
@@ -69,7 +69,7 @@ static PyObject *py_GUID_str(PyObject *py_self)
{
struct GUID *self = pytalloc_get_ptr(py_self);
char *str = GUID_string(NULL, self);
- PyObject *ret = PyStr_FromString(str);
+ PyObject *ret = PyUnicode_FromString(str);
talloc_free(str);
return ret;
}
diff --git a/source4/librpc/ndr/py_security.c b/source4/librpc/ndr/py_security.c
index ecac43bb258..b9dd29310e6 100644
--- a/source4/librpc/ndr/py_security.c
+++ b/source4/librpc/ndr/py_security.c
@@ -116,7 +116,7 @@ static PyObject *py_dom_sid_str(PyObject *py_self)
{
struct dom_sid *self = pytalloc_get_ptr(py_self);
struct dom_sid_buf buf;
- PyObject *ret = PyStr_FromString(dom_sid_str_buf(self, &buf));
+ PyObject *ret = PyUnicode_FromString(dom_sid_str_buf(self, &buf));
return ret;
}
@@ -285,7 +285,7 @@ static PyObject *py_descriptor_as_sddl(PyObject *self, PyObject *args)
text = sddl_encode(NULL, desc, sid);
- ret = PyStr_FromString(text);
+ ret = PyUnicode_FromString(text);
talloc_free(text);
@@ -438,7 +438,7 @@ static PyObject *py_privilege_name(PyObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "i", &priv))
return NULL;
- return PyStr_FromString(sec_privilege_name(priv));
+ return PyUnicode_FromString(sec_privilege_name(priv));
}
static PyObject *py_privilege_id(PyObject *self, PyObject *args)
diff --git a/source4/librpc/rpc/pyrpc.c b/source4/librpc/rpc/pyrpc.c
index 90c890d2a0c..067dadf54a2 100644
--- a/source4/librpc/rpc/pyrpc.c
+++ b/source4/librpc/rpc/pyrpc.c
@@ -95,7 +95,7 @@ static PyObject *py_iface_server_name(PyObject *obj, void *closure)
if (server_name == NULL)
Py_RETURN_NONE;
- return PyStr_FromString(server_name);
+ return PyUnicode_FromString(server_name);
}
static PyObject *py_ndr_syntax_id(struct ndr_syntax_id *syntax_id)
diff --git a/source4/librpc/rpc/pyrpc_util.c b/source4/librpc/rpc/pyrpc_util.c
index e6227eaa604..0d6a16518f1 100644
--- a/source4/librpc/rpc/pyrpc_util.c
+++ b/source4/librpc/rpc/pyrpc_util.c
@@ -416,7 +416,7 @@ PyObject *PyString_FromStringOrNULL(const char *str)
if (str == NULL) {
Py_RETURN_NONE;
}
- return PyStr_FromString(str);
+ return PyUnicode_FromString(str);
}
PyObject *pyrpc_import_union(PyTypeObject *type, TALLOC_CTX *mem_ctx, int level,
diff --git a/source4/param/provision.c b/source4/param/provision.c
index 85671f80b87..177fb93f18c 100644
--- a/source4/param/provision.c
+++ b/source4/param/provision.c
@@ -45,7 +45,7 @@ static bool dict_insert(PyObject* dict,
static PyObject *provision_module(void)
{
- PyObject *name = PyStr_FromString("samba.provision");
+ PyObject *name = PyUnicode_FromString("samba.provision");
PyObject *mod = NULL;
if (name == NULL)
return NULL;
@@ -56,7 +56,7 @@ static PyObject *provision_module(void)
static PyObject *schema_module(void)
{
- PyObject *name = PyStr_FromString("samba.schema");
+ PyObject *name = PyUnicode_FromString("samba.schema");
PyObject *mod = NULL;
if (name == NULL)
return NULL;
@@ -67,7 +67,7 @@ static PyObject *schema_module(void)
static PyObject *ldb_module(void)
{
- PyObject *name = PyStr_FromString("ldb");
+ PyObject *name = PyUnicode_FromString("ldb");
PyObject *mod = NULL;
if (name == NULL)
return NULL;
@@ -152,7 +152,7 @@ NTSTATUS provision_bare(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx,
configfile = lpcfg_configfile(lp_ctx);
if (configfile != NULL) {
if (!dict_insert(parameters, "smbconf",
- PyStr_FromString(configfile))) {
+ PyUnicode_FromString(configfile))) {
status = NT_STATUS_UNSUCCESSFUL;
goto out;
}
@@ -160,40 +160,40 @@ NTSTATUS provision_bare(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx,
if (!dict_insert(parameters,
"rootdn",
- PyStr_FromString(settings->root_dn_str))) {
+ PyUnicode_FromString(settings->root_dn_str))) {
status = NT_STATUS_UNSUCCESSFUL;
goto out;
}
if (settings->targetdir != NULL) {
if (!dict_insert(parameters,
"targetdir",
- PyStr_FromString(settings->targetdir))) {
+ PyUnicode_FromString(settings->targetdir))) {
status = NT_STATUS_UNSUCCESSFUL;
goto out;
}
}
if (!dict_insert(parameters,
"hostname",
- PyStr_FromString(settings->netbios_name))) {
+ PyUnicode_FromString(settings->netbios_name))) {
status = NT_STATUS_UNSUCCESSFUL;
goto out;
}
if (!dict_insert(parameters,
"domain",
- PyStr_FromString(settings->domain))) {
+ PyUnicode_FromString(settings->domain))) {
status = NT_STATUS_UNSUCCESSFUL;
goto out;
}
if (!dict_insert(parameters,
"realm",
- PyStr_FromString(settings->realm))) {
+ PyUnicode_FromString(settings->realm))) {
status = NT_STATUS_UNSUCCESSFUL;
goto out;
}
if (settings->root_dn_str) {
if (!dict_insert(parameters,
"rootdn",
- PyStr_FromString(settings->root_dn_str))) {
+ PyUnicode_FromString(settings->root_dn_str))) {
status = NT_STATUS_UNSUCCESSFUL;
goto out;
}
@@ -202,7 +202,7 @@ NTSTATUS provision_bare(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx,
if (settings->domain_dn_str) {
if (!dict_insert(parameters,
"domaindn",
- PyStr_FromString(settings->domain_dn_str))) {
+ PyUnicode_FromString(settings->domain_dn_str))) {
status = NT_STATUS_UNSUCCESSFUL;
goto out;
}
@@ -211,7 +211,7 @@ NTSTATUS provision_bare(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx,
if (settings->schema_dn_str) {
if (!dict_insert(parameters,
"schemadn",
- PyStr_FromString(settings->schema_dn_str))) {
+ PyUnicode_FromString(settings->schema_dn_str))) {
status = NT_STATUS_UNSUCCESSFUL;
goto out;
}
@@ -219,7 +219,7 @@ NTSTATUS provision_bare(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx,
if (settings->config_dn_str) {
if (!dict_insert(parameters,
"configdn",
- PyStr_FromString(settings->config_dn_str))) {
+ PyUnicode_FromString(settings->config_dn_str))) {
status = NT_STATUS_UNSUCCESSFUL;
goto out;
}
@@ -227,7 +227,7 @@ NTSTATUS provision_bare(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx,
if (settings->server_dn_str) {
if (!dict_insert(parameters,
"serverdn",
- PyStr_FromString(settings->server_dn_str))) {
+ PyUnicode_FromString(settings->server_dn_str))) {
status = NT_STATUS_UNSUCCESSFUL;
goto out;
}
@@ -235,7 +235,7 @@ NTSTATUS provision_bare(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx,
if (settings->site_name) {
if (!dict_insert(parameters,
"sitename",
- PyStr_FromString(settings->site_name))) {
+ PyUnicode_FromString(settings->site_name))) {
status = NT_STATUS_UNSUCCESSFUL;
goto out;
}
@@ -243,7 +243,7 @@ NTSTATUS provision_bare(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx,
if (!dict_insert(parameters,
"machinepass",
- PyStr_FromString(settings->machine_password))){
+ PyUnicode_FromString(settings->machine_password))){
status = NT_STATUS_UNSUCCESSFUL;
goto out;
}
@@ -403,27 +403,27 @@ NTSTATUS provision_store_self_join(TALLOC_CTX *mem_ctx, struct loadparm_context
}
if (!dict_insert(parameters,
"domain",
- PyStr_FromString(settings->domain_name))) {
+ PyUnicode_FromString(settings->domain_name))) {
status = NT_STATUS_UNSUCCESSFUL;
goto out;
}
if (settings->realm != NULL) {
if (!dict_insert(parameters,
"realm",
- PyStr_FromString(settings->realm))) {
+ PyUnicode_FromString(settings->realm))) {
status = NT_STATUS_UNSUCCESSFUL;
goto out;
}
}
if (!dict_insert(parameters,
"machinepass",
- PyStr_FromString(settings->machine_password))) {
+ PyUnicode_FromString(settings->machine_password))) {
status = NT_STATUS_UNSUCCESSFUL;
goto out;
}
if (!dict_insert(parameters,
"netbiosname",
- PyStr_FromString(settings->netbios_name))) {
+ PyUnicode_FromString(settings->netbios_name))) {
status = NT_STATUS_UNSUCCESSFUL;
goto out;
}
@@ -527,7 +527,7 @@ struct ldb_context *provision_get_schema(TALLOC_CTX *mem_ctx,
if (schema_dn) {
if (!dict_insert(parameters,
"schemadn",
- PyStr_FromString(schema_dn))) {
+ PyUnicode_FromString(schema_dn))) {
return NULL;
}
}
diff --git a/source4/param/pyparam.c b/source4/param/pyparam.c
index df0879a3c71..cf7423ddec3 100644
--- a/source4/param/pyparam.c
+++ b/source4/param/pyparam.c
@@ -63,7 +63,7 @@ static PyObject *py_lp_ctx_get_helper(struct loadparm_context *lp_ctx, const cha
if (value == NULL) {
return NULL;
}
- return PyStr_FromString(value);
+ return PyUnicode_FromString(value);
}
parm = lpcfg_parm_struct(lp_ctx, param_name);
@@ -83,7 +83,7 @@ static PyObject *py_lp_ctx_get_helper(struct loadparm_context *lp_ctx, const cha
value = lpcfg_get_parametric(lp_ctx, NULL, type, option);
if (value == NULL)
return NULL;
- return PyStr_FromString(value);
+ return PyUnicode_FromString(value);
} else {
/* its a global parameter */
parm = lpcfg_parm_struct(lp_ctx, param_name);
@@ -103,7 +103,7 @@ static PyObject *py_lp_ctx_get_helper(struct loadparm_context *lp_ctx, const cha
return PyStr_FromFormat("%c", *(char *)parm_ptr);
case P_STRING:
case P_USTRING:
- return PyStr_FromString(*(char **)parm_ptr);
+ return PyUnicode_FromString(*(char **)parm_ptr);
case P_BOOL:
return PyBool_FromLong(*(bool *)parm_ptr);
case P_BOOLREV:
@@ -115,7 +115,7 @@ static PyObject *py_lp_ctx_get_helper(struct loadparm_context *lp_ctx, const cha
case P_ENUM:
for (i=0; parm->enum_list[i].name; i++) {
if (*(int *)parm_ptr == parm->enum_list[i].value) {
- return PyStr_FromString(parm->enum_list[i].name);
+ return PyUnicode_FromString(parm->enum_list[i].name);
}
}
return NULL;
@@ -133,7 +133,7 @@ static PyObject *py_lp_ctx_get_helper(struct loadparm_context *lp_ctx, const cha
pylist = PyList_New(str_list_length(strlist));
for (j = 0; strlist[j]; j++)
PyList_SetItem(pylist, j,
- PyStr_FromString(strlist[j]));
+ PyUnicode_FromString(strlist[j]));
return pylist;
}
}
@@ -225,7 +225,7 @@ static PyObject *py_lp_ctx_private_path(PyObject *self, PyObject *args)
return NULL;
path = lpcfg_private_path(NULL, PyLoadparmContext_AsLoadparmContext(self), name);
- ret = PyStr_FromString(path);
+ ret = PyUnicode_FromString(path);
talloc_free(path);
return ret;
@@ -240,7 +240,7 @@ static PyObject *py_lp_ctx_services(PyObject *self, PyObject *unused)
for (i = 0; i < lpcfg_numservices(lp_ctx); i++) {
struct loadparm_service *service = lpcfg_servicebynum(lp_ctx, i);
if (service != NULL) {
- PyList_SetItem(ret, i, PyStr_FromString(lpcfg_servicename(service)));
+ PyList_SetItem(ret, i, PyUnicode_FromString(lpcfg_servicename(service)));
}
}
return ret;
@@ -255,7 +255,7 @@ static PyObject *py_lp_ctx_server_role(PyObject *self, PyObject *unused)
role = lpcfg_server_role(lp_ctx);
role_str = server_role_str(role);
- return PyStr_FromString(role_str);
+ return PyUnicode_FromString(role_str);
}
static PyObject *py_lp_dump(PyObject *self, PyObject *args)
@@ -375,7 +375,7 @@ static PyObject *py_cache_path(PyObject *self, PyObject *args)
"Unable to access cache %s", name);
return NULL;
}
- ret = PyStr_FromString(path);
+ ret = PyUnicode_FromString(path);
talloc_free(path);
return ret;
@@ -399,7 +399,7 @@ static PyObject *py_state_path(PyObject *self, PyObject *args)
"Unable to access cache %s", name);
return NULL;
}
- ret = PyStr_FromString(path);
+ ret = PyUnicode_FromString(path);
talloc_free(path);
return ret;
@@ -460,7 +460,7 @@ static PyObject *py_lp_ctx_config_file(PyObject *self, void *closure)
if (configfile == NULL)
Py_RETURN_NONE;
else
- return PyStr_FromString(configfile);
+ return PyUnicode_FromString(configfile);
}
static PyGetSetDef py_lp_ctx_getset[] = {
@@ -616,27 +616,27 @@ PyTypeObject PyLoadparmService = {
static PyObject *py_default_path(PyObject *self, PyObject *Py_UNUSED(ignored))
{
- return PyStr_FromString(lp_default_path());
+ return PyUnicode_FromString(lp_default_path());
}
static PyObject *py_setup_dir(PyObject *self, PyObject *Py_UNUSED(ignored))
{
- return PyStr_FromString(dyn_SETUPDIR);
+ return PyUnicode_FromString(dyn_SETUPDIR);
}
static PyObject *py_modules_dir(PyObject *self, PyObject *Py_UNUSED(ignored))
{
- return PyStr_FromString(dyn_MODULESDIR);
+ return PyUnicode_FromString(dyn_MODULESDIR);
}
static PyObject *py_bin_dir(PyObject *self, PyObject *Py_UNUSED(ignored))
{
- return PyStr_FromString(dyn_BINDIR);
+ return PyUnicode_FromString(dyn_BINDIR);
}
static PyObject *py_sbin_dir(PyObject *self, PyObject *Py_UNUSED(ignored))
{
- return PyStr_FromString(dyn_SBINDIR);
+ return PyUnicode_FromString(dyn_SBINDIR);
}
static PyMethodDef pyparam_methods[] = {
View Lorry Controller Status