This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "includes.h"
-#include "Python.h"
-
-#include "python/py_common_proto.h"
+#include "python/py_common.h"
/* Return a tuple of (error code, error string) from a WERROR */
void py_samba_init(void)
{
- extern pstring global_myname;
- char *p;
-
if (initialised)
return;
+ load_case_tables();
+
/* Load configuration file */
- if (!lp_load(dyn_CONFIGFILE, True, False, False))
+ if (!lp_load(dyn_CONFIGFILE, True, False, False, True))
fprintf(stderr, "Can't load %s\n", dyn_CONFIGFILE);
/* Misc other stuff */
load_interfaces();
-
- fstrcpy(global_myname, myhostname());
- p = strchr(global_myname, '.');
- if (p)
- *p = 0;
+ init_names();
initialised = True;
}
return Py_None;
}
-/* Return a cli_state to a RPC pipe on the given server. Use the
- credentials passed if not NULL. If an error occurs errstr is set to a
- string describing the error and NULL is returned. If set, errstr must
- be freed by calling free(). */
+/* Parse credentials from a python dictionary. The dictionary can
+ only have the keys "username", "domain" and "password". Return
+ True for valid credentials in which case the username, domain and
+ password are set to pointers to their values from the dicationary.
+ If returns False, the errstr is set to point at some mallocated
+ memory describing the error. */
-struct cli_state *open_pipe_creds(char *server, PyObject *creds,
- char *pipe_name, char **errstr)
+BOOL py_parse_creds(PyObject *creds, char **username, char **domain,
+ char **password, char **errstr)
{
- char *username = "", *password = "", *domain = "";
- struct cli_state *cli;
- NTSTATUS result;
- struct in_addr server_ip;
- extern pstring global_myname;
-
- /* Extract credentials from the python dictionary */
+ /* Initialise anonymous credentials */
+
+ *username = "";
+ *domain = "";
+ *password = "";
if (creds && PyDict_Size(creds) > 0) {
PyObject *username_obj, *password_obj, *domain_obj;
+ PyObject *key, *value;
+ int i;
- /* Check credentials passed are valid. This means the
- username, domain and password keys must exist and be
- string objects. */
+ /* Check for presence of required fields */
username_obj = PyDict_GetItemString(creds, "username");
domain_obj = PyDict_GetItemString(creds, "domain");
password_obj = PyDict_GetItemString(creds, "password");
- if (!username_obj || !domain_obj || !password_obj) {
- creds_error:
- *errstr = strdup("invalid credentials");
- return NULL;
+ if (!username_obj) {
+ *errstr = SMB_STRDUP("no username field in credential");
+ return False;
+ }
+
+ if (!domain_obj) {
+ *errstr = SMB_STRDUP("no domain field in credential");
+ return False;
}
- if (!PyString_Check(username_obj) ||
- !PyString_Check(domain_obj) ||
- !PyString_Check(password_obj))
- goto creds_error;
+ if (!password_obj) {
+ *errstr = SMB_STRDUP("no password field in credential");
+ return False;
+ }
- username = PyString_AsString(username_obj);
- domain = PyString_AsString(domain_obj);
- password = PyString_AsString(password_obj);
+ /* Check type of required fields */
- if (!username || !domain || !password)
- goto creds_error;
+ if (!PyString_Check(username_obj)) {
+ *errstr = SMB_STRDUP("username field is not string type");
+ return False;
+ }
+
+ if (!PyString_Check(domain_obj)) {
+ *errstr = SMB_STRDUP("domain field is not string type");
+ return False;
+ }
+
+ if (!PyString_Check(password_obj)) {
+ *errstr = SMB_STRDUP("password field is not string type");
+ return False;
+ }
+
+ /* Look for any extra fields */
+
+ i = 0;
+
+ while (PyDict_Next(creds, &i, &key, &value)) {
+ if (strcmp(PyString_AsString(key), "domain") != 0 &&
+ strcmp(PyString_AsString(key), "username") != 0 &&
+ strcmp(PyString_AsString(key), "password") != 0) {
+ asprintf(errstr,
+ "creds contain extra field '%s'",
+ PyString_AsString(key));
+ return False;
+ }
+ }
+
+ /* Assign values */
+
+ *username = PyString_AsString(username_obj);
+ *domain = PyString_AsString(domain_obj);
+ *password = PyString_AsString(password_obj);
}
- /* Now try to connect */
+ *errstr = NULL;
+
+ return True;
+}
- if (!resolve_name(server, &server_ip, 0x20)) {
- asprintf(errstr, "unable to resolve %s", server);
+/* Return a cli_state to a RPC pipe on the given server. Use the
+ credentials passed if not NULL. If an error occurs errstr is set to a
+ string describing the error and NULL is returned. If set, errstr must
+ be freed by calling free(). */
+
+struct cli_state *open_pipe_creds(char *server, PyObject *creds,
+ int pipe_idx, char **errstr)
+{
+ char *username, *password, *domain;
+ struct cli_state *cli;
+ struct rpc_pipe_client *pipe_hnd;
+ NTSTATUS result;
+
+ /* Extract credentials from the python dictionary */
+
+ if (!py_parse_creds(creds, &username, &domain, &password, errstr))
return NULL;
- }
+
+ /* Now try to connect */
result = cli_full_connection(
- &cli, global_myname, server, &server_ip, 0, "IPC$", "IPC",
- username, domain, password, strlen(password));
+ &cli, NULL, server, NULL, 0, "IPC$", "IPC",
+ username, domain, password, 0, Undefined, NULL);
- if (!NT_STATUS_IS_OK(result) || !cli_nt_session_open(cli, pipe_name)) {
+ if (!NT_STATUS_IS_OK(result)) {
+ *errstr = SMB_STRDUP("error connecting to IPC$ pipe");
+ return NULL;
+ }
+
+ pipe_hnd = cli_rpc_pipe_open_noauth(cli, pipe_idx, &result);
+ if (!pipe_hnd) {
cli_shutdown(cli);
- free(cli);
- *errstr = strdup("pipe not available");
+ asprintf(errstr, "error opening pipe index %d", pipe_idx);
return NULL;
}
git.samba.org / samba.git / blobdiff