[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 6589f17 pyldb: Drop unnecessary dependency on pytalloc-util.
from 5f23776 s3:smb2cli: pass timeout to smb2cli_req_create/send()
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 6589f1712fbca0db5aa5011dc9330dddf5897233
Author: Jelmer Vernooij jel...@samba.org
Date: Sun Sep 18 15:23:56 2011 +0200
pyldb: Drop unnecessary dependency on pytalloc-util.
Autobuild-User: Jelmer Vernooij jel...@samba.org
Autobuild-Date: Sun Sep 18 17:23:40 CEST 2011 on sn-devel-104
---
Summary of changes:
lib/ldb/pyldb.c |1 -
lib/ldb/wscript |2 +-
2 files changed, 1 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/ldb/pyldb.c b/lib/ldb/pyldb.c
index cb13fe9..dbdfe77 100644
--- a/lib/ldb/pyldb.c
+++ b/lib/ldb/pyldb.c
@@ -29,7 +29,6 @@
*/
#include Python.h
-#include pytalloc.h
#include ldb_private.h
#include pyldb.h
diff --git a/lib/ldb/wscript b/lib/ldb/wscript
index 0713464..c4bfa21 100755
--- a/lib/ldb/wscript
+++ b/lib/ldb/wscript
@@ -113,7 +113,7 @@ def build(bld):
if not bld.CONFIG_SET('USING_SYSTEM_PYLDB_UTIL'):
bld.SAMBA_LIBRARY('pyldb-util',
- deps='ldb pytalloc-util',
+ deps='ldb',
source='pyldb_util.c',
public_headers='pyldb.h',
public_headers_install=not private_library,
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 31c1c49 s3: Fix a c++ warning
via 49233b4 s3: Fix ISO C90 forbids mixed declarations and code
via 120b139 swrap: Fix a c++ warning
via dea2bd5 s3: Fix two c++ warnings
from 6589f17 pyldb: Drop unnecessary dependency on pytalloc-util.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 31c1c49b58453704a262c2524eafac5db7d1f803
Author: Volker Lendecke v...@samba.org
Date: Sun Sep 18 01:52:14 2011 +0200
s3: Fix a c++ warning
Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Sun Sep 18 18:55:48 CEST 2011 on sn-devel-104
commit 49233b41e64e931706d35741c714b6273e8f6e1e
Author: Volker Lendecke v...@samba.org
Date: Sun Sep 18 01:50:37 2011 +0200
s3: Fix ISO C90 forbids mixed declarations and code
commit 120b1392d3e6bc0c7a3e25d22df5121819462730
Author: Volker Lendecke v...@samba.org
Date: Sun Sep 18 01:31:44 2011 +0200
swrap: Fix a c++ warning
commit dea2bd5b9b1fb99329f644b58682ca3f38e7570c
Author: Volker Lendecke v...@samba.org
Date: Sun Sep 18 01:27:53 2011 +0200
s3: Fix two c++ warnings
---
Summary of changes:
lib/socket_wrapper/socket_wrapper.c |3 ++-
source3/modules/vfs_acl_common.c|3 ++-
source3/rpc_client/util_lsarpc.c|4 ++--
source3/utils/net_rpc_conf.c|6 +++---
4 files changed, 9 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/socket_wrapper/socket_wrapper.c
b/lib/socket_wrapper/socket_wrapper.c
index 9469809..ddfc74f 100644
--- a/lib/socket_wrapper/socket_wrapper.c
+++ b/lib/socket_wrapper/socket_wrapper.c
@@ -2198,7 +2198,8 @@ _PUBLIC_ ssize_t swrap_sendto(int s, const void *buf,
size_t len, int flags, con
return len;
}
- ret = real_sendto(s, buf, len, flags, msg.msg_name, msg.msg_namelen);
+ ret = real_sendto(s, buf, len, flags, (struct sockaddr *)msg.msg_name,
+ msg.msg_namelen);
swrap_sendmsg_after(si, msg, to, ret);
diff --git a/source3/modules/vfs_acl_common.c b/source3/modules/vfs_acl_common.c
index f2f55ec..9a1d13b 100644
--- a/source3/modules/vfs_acl_common.c
+++ b/source3/modules/vfs_acl_common.c
@@ -656,7 +656,8 @@ static int open_acl_common(vfs_handle_struct *handle,
/* Cache the parent security descriptor for
* later use. */
- pp_psd = VFS_ADD_FSP_EXTENSION(handle,
+ pp_psd = (struct security_descriptor **)
+ VFS_ADD_FSP_EXTENSION(handle,
fsp,
struct security_descriptor *,
NULL);
diff --git a/source3/rpc_client/util_lsarpc.c b/source3/rpc_client/util_lsarpc.c
index 169c10b..d67144b 100644
--- a/source3/rpc_client/util_lsarpc.c
+++ b/source3/rpc_client/util_lsarpc.c
@@ -50,7 +50,7 @@ static NTSTATUS
ai_array_2_trust_domain_info_buffer(TALLOC_CTX *mem_ctx,
status = NT_STATUS_INVALID_PARAMETER;
goto fail;
}
- b[i].data.data = talloc_memdup(b,
+ b[i].data.data = (uint8_t *)talloc_memdup(b,
ai-array[i].AuthInfo.nt4owf.password.hash,
16);
if (b[i].data.data == NULL) {
@@ -76,7 +76,7 @@ static NTSTATUS
ai_array_2_trust_domain_info_buffer(TALLOC_CTX *mem_ctx,
goto fail;
}
b[i].data.size = 4;
- b[i].data.data = talloc_memdup(b,
+ b[i].data.data = (uint8_t *)talloc_memdup(b,
ai-array[i].AuthInfo.version.version, 4);
if (b[i].data.data == NULL) {
status = NT_STATUS_NO_MEMORY;
diff --git a/source3/utils/net_rpc_conf.c b/source3/utils/net_rpc_conf.c
index a4bb733..3dec375 100644
--- a/source3/utils/net_rpc_conf.c
+++ b/source3/utils/net_rpc_conf.c
@@ -1759,6 +1759,9 @@ static NTSTATUS rpc_conf_setparm_internal(struct
net_context *c,
struct winreg_String key, keyclass;
enum winreg_CreateAction action = 0;
+ const char *canon_valname;
+ const char *canon_valstr;
+
ZERO_STRUCT(hive_hnd);
ZERO_STRUCT(key_hnd);
ZERO_STRUCT(share_hnd);
@@ -1839,9 +1842,6 @@ static NTSTATUS rpc_conf_setparm_internal(struct
net_context *c,
break;
}
-
- const char *canon_valname;
- const char *canon_valstr;
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via e3e7869 s3:smb2cli: s/smb2cli_sesssetup/smb2cli_sesssetup_ntlmssp/
from 31c1c49 s3: Fix a c++ warning
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit e3e7869f6118126f4a7e608711ca4018e272835b
Author: Stefan Metzmacher me...@samba.org
Date: Sun Sep 18 20:09:48 2011 +0200
s3:smb2cli: s/smb2cli_sesssetup/smb2cli_sesssetup_ntlmssp/
metze
Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Sun Sep 18 21:43:26 CEST 2011 on sn-devel-104
---
Summary of changes:
source3/libsmb/smb2cli.h |6 +++---
source3/libsmb/smb2cli_session.c | 28 ++--
source3/torture/test_smb2.c |2 +-
3 files changed, 18 insertions(+), 18 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libsmb/smb2cli.h b/source3/libsmb/smb2cli.h
index 5db481f..faf7367 100644
--- a/source3/libsmb/smb2cli.h
+++ b/source3/libsmb/smb2cli.h
@@ -26,14 +26,14 @@ struct tevent_req *smb2cli_negprot_send(TALLOC_CTX *mem_ctx,
NTSTATUS smb2cli_negprot_recv(struct tevent_req *req);
NTSTATUS smb2cli_negprot(struct cli_state *cli);
-struct tevent_req *smb2cli_sesssetup_send(TALLOC_CTX *mem_ctx,
+struct tevent_req *smb2cli_sesssetup_ntlmssp_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
struct cli_state *cli,
const char *user,
const char *domain,
const char *pass);
-NTSTATUS smb2cli_sesssetup_recv(struct tevent_req *req);
-NTSTATUS smb2cli_sesssetup(struct cli_state *cli, const char *user,
+NTSTATUS smb2cli_sesssetup_ntlmssp_recv(struct tevent_req *req);
+NTSTATUS smb2cli_sesssetup_ntlmssp(struct cli_state *cli, const char *user,
const char *domain, const char *pass);
struct tevent_req *smb2cli_logoff_send(TALLOC_CTX *mem_ctx,
diff --git a/source3/libsmb/smb2cli_session.c b/source3/libsmb/smb2cli_session.c
index 28b8f91..1ba63b0 100644
--- a/source3/libsmb/smb2cli_session.c
+++ b/source3/libsmb/smb2cli_session.c
@@ -154,7 +154,7 @@ static NTSTATUS smb2cli_sesssetup_blob_recv(struct
tevent_req *req,
return status;
}
-struct smb2cli_sesssetup_state {
+struct smb2cli_sesssetup_ntlmssp_state {
struct tevent_context *ev;
struct cli_state *cli;
struct ntlmssp_state *ntlmssp;
@@ -164,9 +164,9 @@ struct smb2cli_sesssetup_state {
int turn;
};
-static void smb2cli_sesssetup_done(struct tevent_req *subreq);
+static void smb2cli_sesssetup_ntlmssp_done(struct tevent_req *subreq);
-struct tevent_req *smb2cli_sesssetup_send(TALLOC_CTX *mem_ctx,
+struct tevent_req *smb2cli_sesssetup_ntlmssp_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
struct cli_state *cli,
const char *user,
@@ -174,13 +174,13 @@ struct tevent_req *smb2cli_sesssetup_send(TALLOC_CTX
*mem_ctx,
const char *pass)
{
struct tevent_req *req, *subreq;
- struct smb2cli_sesssetup_state *state;
+ struct smb2cli_sesssetup_ntlmssp_state *state;
NTSTATUS status;
DATA_BLOB blob_out;
const char *OIDs_ntlm[] = {OID_NTLMSSP, NULL};
req = tevent_req_create(mem_ctx, state,
- struct smb2cli_sesssetup_state);
+ struct smb2cli_sesssetup_ntlmssp_state);
if (req == NULL) {
return NULL;
}
@@ -224,21 +224,21 @@ struct tevent_req *smb2cli_sesssetup_send(TALLOC_CTX
*mem_ctx,
if (tevent_req_nomem(subreq, req)) {
return tevent_req_post(req, ev);
}
- tevent_req_set_callback(subreq, smb2cli_sesssetup_done, req);
+ tevent_req_set_callback(subreq, smb2cli_sesssetup_ntlmssp_done, req);
return req;
post_status:
tevent_req_nterror(req, status);
return tevent_req_post(req, ev);
}
-static void smb2cli_sesssetup_done(struct tevent_req *subreq)
+static void smb2cli_sesssetup_ntlmssp_done(struct tevent_req *subreq)
{
struct tevent_req *req =
tevent_req_callback_data(subreq,
struct tevent_req);
- struct smb2cli_sesssetup_state *state =
+ struct smb2cli_sesssetup_ntlmssp_state *state =
tevent_req_data(req,
- struct smb2cli_sesssetup_state);
+ struct smb2cli_sesssetup_ntlmssp_state);
NTSTATUS status;
uint64_t uid = 0;
DATA_BLOB blob, blob_in, blob_out, spnego_blob;
@@ -294,15 +294,15 @@ static void smb2cli_sesssetup_done(struct tevent_req
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 507f1fc s3: Add some const to
create_local_private_krb5_conf_for_domain
via b126164 s3: Add some const to print_kdc_line
from e3e7869 s3:smb2cli: s/smb2cli_sesssetup/smb2cli_sesssetup_ntlmssp/
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 507f1fcdcbfa9e67e7a03c6e488f45b71c3327e3
Author: Volker Lendecke v...@samba.org
Date: Sun Sep 18 21:59:31 2011 +0200
s3: Add some const to create_local_private_krb5_conf_for_domain
Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Sun Sep 18 23:31:28 CEST 2011 on sn-devel-104
commit b126164ecef48032389840848323e7e8627cabd5
Author: Volker Lendecke v...@samba.org
Date: Sun Sep 18 21:59:20 2011 +0200
s3: Add some const to print_kdc_line
---
Summary of changes:
source3/libads/kerberos.c |4 ++--
source3/libads/kerberos_proto.h |2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libads/kerberos.c b/source3/libads/kerberos.c
index 913d690..a64e729 100644
--- a/source3/libads/kerberos.c
+++ b/source3/libads/kerberos.c
@@ -738,7 +738,7 @@ static char *print_kdc_line(char *mem_ctx,
static char *get_kdc_ip_string(char *mem_ctx,
const char *realm,
const char *sitename,
- struct sockaddr_storage *pss,
+ const struct sockaddr_storage *pss,
const char *kdc_name)
{
int i;
@@ -837,7 +837,7 @@ static char *get_kdc_ip_string(char *mem_ctx,
bool create_local_private_krb5_conf_for_domain(const char *realm,
const char *domain,
const char *sitename,
- struct sockaddr_storage *pss,
+ const struct sockaddr_storage
*pss,
const char *kdc_name)
{
char *dname;
diff --git a/source3/libads/kerberos_proto.h b/source3/libads/kerberos_proto.h
index 406669c..ff1082a 100644
--- a/source3/libads/kerberos_proto.h
+++ b/source3/libads/kerberos_proto.h
@@ -75,7 +75,7 @@ int kerberos_kinit_password(const char *principal,
bool create_local_private_krb5_conf_for_domain(const char *realm,
const char *domain,
const char *sitename,
- struct sockaddr_storage *pss,
+ const struct sockaddr_storage
*pss,
const char *kdc_name);
/* The following definitions come from libads/authdata.c */
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 4e05847 Fix a typo. This is not an electromagnet pulse daemon I guess :-) from 507f1fc s3: Add some const to create_local_private_krb5_conf_for_domain http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 4e058475fbce5c5654829e278f9f4eb76331efd7 Author: Volker Lendecke v...@samba.org Date: Sun Sep 18 23:19:41 2011 +0200 Fix a typo. This is not an electromagnet pulse daemon I guess :-) Autobuild-User: Volker Lendecke vlen...@samba.org Autobuild-Date: Mon Sep 19 01:25:23 CEST 2011 on sn-devel-104 --- Summary of changes: docs-xml/smbdotconf/misc/rpcdaemon.xml |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/smbdotconf/misc/rpcdaemon.xml b/docs-xml/smbdotconf/misc/rpcdaemon.xml index e84db21..4ba27fc 100644 --- a/docs-xml/smbdotconf/misc/rpcdaemon.xml +++ b/docs-xml/smbdotconf/misc/rpcdaemon.xml @@ -55,7 +55,7 @@ Samba includes separate daemons for spoolss and the lsarpc/lsass, netlogon and samr pipes. Currently three daemons are available and they are called: - command moreinfo=noneempd/command + command moreinfo=noneepmd/command command moreinfo=nonelsasd/command command moreinfo=nonespoolssd/command Example: -- Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated via 9d98461 s4-dsdb: cope with out of sync replication attributes in partition module via 2e76b79 ldb:ldb_extended -make the call more similar to ldb_search via 966b5d5 pyldb: fixed places where we try to concatenate a Dn with a string via f79d6ee s4-provision: use get_config_basedn() in DNS setup via 579fd43 samba-tool: use get_config_basedn() to get configuration NC DN via ee7cfca s4-kdc: default kvno for inter-domain trusts to zero via 4577ee1 s4-dsdb: use get_config_basedn() in python tests via cea37b0 s4-drs: cope with REPL_OBJ getncchanges call for new object via aa960d8 s4-provision Add initial support for joining as a new subdomain from 4e05847 Fix a typo. This is not an electromagnet pulse daemon I guess :-) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log - commit 9d9846115068cfb328a18a0a2eddb5698a21edb8 Author: Andrew Tridgell tri...@samba.org Date: Mon Sep 19 10:55:17 2011 +1000 s4-dsdb: cope with out of sync replication attributes in partition module if the @ATTRIBUTES or other objects which are replicated between partions become out of sync, then the ldb would fail to open. This changes ensures that we can always fix those records, by running the operation in the top level partition, and replicating the result to the other partitions Pair-Programmed-With: Amitay Isaacs ami...@gmail.com Autobuild-User: Andrew Tridgell tri...@samba.org Autobuild-Date: Mon Sep 19 04:31:48 CEST 2011 on sn-devel-104 commit 2e76b798fe9732284a50b43cf10a0f3802ea6e4f Author: Matthias Dieter Wallnöfer m...@samba.org Date: Tue Jun 21 22:25:22 2011 +0200 ldb:ldb_extended -make the call more similar to ldb_search For example NULL out the LDB result pointer on failures. Signed-off-by: Andrew Tridgell tri...@samba.org commit 966b5d5de2fc40ff77e2b947c61a2419795a2282 Author: Andrew Tridgell tri...@samba.org Date: Fri Sep 16 15:15:35 2011 +1000 pyldb: fixed places where we try to concatenate a Dn with a string you need to either use str(dn) or use %s in a format string commit f79d6ee929884ad76f2a88fc67c660fec31b8ed7 Author: Andrew Tridgell tri...@samba.org Date: Fri Sep 16 11:18:26 2011 +1000 s4-provision: use get_config_basedn() in DNS setup Pair-Programmed-With: Andrew Bartlett abart...@samba.org commit 579fd43057e5d838ef24a72af20203eda8199204 Author: Andrew Tridgell tri...@samba.org Date: Fri Sep 16 11:18:05 2011 +1000 samba-tool: use get_config_basedn() to get configuration NC DN this allows these commands to work for subdomains Pair-Programmed-With: Andrew Bartlett abart...@samba.org commit ee7cfcadc60eac34bf646f765798ca5a01d311ed Author: Andrew Tridgell tri...@samba.org Date: Fri Sep 16 11:15:27 2011 +1000 s4-kdc: default kvno for inter-domain trusts to zero the exact value doesn't matter, as both Samba and windows check against the latest password, but the old default of -1 caused ASN.1 parsing errors on windows, which prevented it answering TGS requests thanks to Hongwei Sun for finding this from a ttt trace Pair-Programmed-With: Andrew Bartlett abart...@samba.org commit 4577ee1f957e08d19b2c849b9b698b31474040ff Author: Andrew Tridgell tri...@samba.org Date: Fri Sep 16 11:14:12 2011 +1000 s4-dsdb: use get_config_basedn() in python tests we can't just append CN=Configuration to the basedn, as that won't give the right configuration DN for a subdomain of a forest Pair-Programmed-With: Andrew Bartlett abart...@samba.org commit cea37b0d6d0f5f32fdfafd160dfbcf2c5dccdb12 Author: Andrew Tridgell tri...@samba.org Date: Fri Sep 16 11:13:05 2011 +1000 s4-drs: cope with REPL_OBJ getncchanges call for new object when we do a subdomain join we create a new object using a REPL_OBJ getncchanges call for the partitions DN. This has a side effect of creating that object. We need to skip the UDV update in that case Pair-Programmed-With: Andrew Bartlett abart...@samba.org commit aa960d8fa70ab243e97eed5d7bb7a47f4386487c Author: Andrew Bartlett abart...@samba.org Date: Wed Aug 24 15:39:51 2011 +1000 s4-provision Add initial support for joining as a new subdomain To do this we need to reorganise a lot of the provision code, so that we can create the framework for the inbound replicaton of the config and schema partitions and then add in the new subdomain locally. Andrew Bartlett --- Summary of changes: lib/ldb/common/ldb.c |8 +- source4/dsdb/samdb/ldb_modules/partition.c | 69 +- source4/dsdb/samdb/ldb_modules/repl_meta_data.c| 15 ++-
autobuild: intermittent test failure detected
The autobuild test system has detected an intermittent failing test in the current master tree. The autobuild log of the failure is available here: http://git.samba.org/autobuild.flakey/2011-09-19-0501/flakey.log The samba3 build logs are available here: http://git.samba.org/autobuild.flakey/2011-09-19-0501/samba3.stderr http://git.samba.org/autobuild.flakey/2011-09-19-0501/samba3.stdout The source4 build logs are available here: http://git.samba.org/autobuild.flakey/2011-09-19-0501/samba4.stderr http://git.samba.org/autobuild.flakey/2011-09-19-0501/samba4.stdout The top commit at the time of the failure was: commit 4e058475fbce5c5654829e278f9f4eb76331efd7 Author: Volker Lendecke v...@samba.org Date: Sun Sep 18 23:19:41 2011 +0200 Fix a typo. This is not an electromagnet pulse daemon I guess :-) Autobuild-User: Volker Lendecke vlen...@samba.org Autobuild-Date: Mon Sep 19 01:25:23 CEST 2011 on sn-devel-104
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via d49f509 s3:smb2cli: remove unused struct ntlmssp_state from
smb2cli_session_setup_state
via d02e7f7 s3:smb2cli: s/smb2cli_sesssetup_blob/smb2cli_session_setup/
from 9d98461 s4-dsdb: cope with out of sync replication attributes in
partition module
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit d49f509ec606175fedf41126a3d58c9681932f09
Author: Stefan Metzmacher me...@samba.org
Date: Sun Sep 18 20:24:38 2011 +0200
s3:smb2cli: remove unused struct ntlmssp_state from
smb2cli_session_setup_state
metze
Autobuild-User: Stefan Metzmacher me...@samba.org
Autobuild-Date: Mon Sep 19 06:06:46 CEST 2011 on sn-devel-104
commit d02e7f725eddca09dc0f8c788acf5af70f12a225
Author: Stefan Metzmacher me...@samba.org
Date: Sun Sep 18 20:23:22 2011 +0200
s3:smb2cli: s/smb2cli_sesssetup_blob/smb2cli_session_setup/
metze
---
Summary of changes:
source3/libsmb/smb2cli_session.c | 31 +++
1 files changed, 15 insertions(+), 16 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/libsmb/smb2cli_session.c b/source3/libsmb/smb2cli_session.c
index 1ba63b0..58204be 100644
--- a/source3/libsmb/smb2cli_session.c
+++ b/source3/libsmb/smb2cli_session.c
@@ -27,29 +27,28 @@
#include ../libcli/auth/spnego.h
#include ../libcli/auth/ntlmssp.h
-struct smb2cli_sesssetup_blob_state {
- struct ntlmssp_state *ntlmssp;
+struct smb2cli_session_setup_state {
uint8_t fixed[24];
uint8_t dyn_pad[1];
uint64_t uid;
DATA_BLOB out;
};
-static void smb2cli_sesssetup_blob_done(struct tevent_req *subreq);
+static void smb2cli_session_setup_done(struct tevent_req *subreq);
-static struct tevent_req *smb2cli_sesssetup_blob_send(TALLOC_CTX *mem_ctx,
+static struct tevent_req *smb2cli_session_setup_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
struct cli_state *cli,
DATA_BLOB *blob)
{
struct tevent_req *req, *subreq;
- struct smb2cli_sesssetup_blob_state *state;
+ struct smb2cli_session_setup_state *state;
uint8_t *buf;
uint8_t *dyn;
size_t dyn_len;
req = tevent_req_create(mem_ctx, state,
- struct smb2cli_sesssetup_blob_state);
+ struct smb2cli_session_setup_state);
if (req == NULL) {
return NULL;
}
@@ -84,18 +83,18 @@ static struct tevent_req
*smb2cli_sesssetup_blob_send(TALLOC_CTX *mem_ctx,
if (tevent_req_nomem(subreq, req)) {
return tevent_req_post(req, ev);
}
- tevent_req_set_callback(subreq, smb2cli_sesssetup_blob_done, req);
+ tevent_req_set_callback(subreq, smb2cli_session_setup_done, req);
return req;
}
-static void smb2cli_sesssetup_blob_done(struct tevent_req *subreq)
+static void smb2cli_session_setup_done(struct tevent_req *subreq)
{
struct tevent_req *req =
tevent_req_callback_data(subreq,
struct tevent_req);
- struct smb2cli_sesssetup_blob_state *state =
+ struct smb2cli_session_setup_state *state =
tevent_req_data(req,
- struct smb2cli_sesssetup_blob_state);
+ struct smb2cli_session_setup_state);
NTSTATUS status;
struct iovec *iov;
uint16_t offset, length;
@@ -137,12 +136,12 @@ static void smb2cli_sesssetup_blob_done(struct tevent_req
*subreq)
tevent_req_done(req);
}
-static NTSTATUS smb2cli_sesssetup_blob_recv(struct tevent_req *req,
+static NTSTATUS smb2cli_session_setup_recv(struct tevent_req *req,
uint64_t *uid, DATA_BLOB *out)
{
- struct smb2cli_sesssetup_blob_state *state =
+ struct smb2cli_session_setup_state *state =
tevent_req_data(req,
- struct smb2cli_sesssetup_blob_state);
+ struct smb2cli_session_setup_state);
NTSTATUS status = NT_STATUS_OK;
if (tevent_req_is_nterror(req, status)
@@ -219,7 +218,7 @@ struct tevent_req
*smb2cli_sesssetup_ntlmssp_send(TALLOC_CTX *mem_ctx,
blob_out = spnego_gen_negTokenInit(state, OIDs_ntlm, blob_out, NULL);
state-turn = 1;
- subreq = smb2cli_sesssetup_blob_send(
+ subreq = smb2cli_session_setup_send(
state, state-ev, state-cli, blob_out);
if (tevent_req_nomem(subreq, req)) {
return tevent_req_post(req, ev);
@@ -244,7 +243,7 @@ static void smb2cli_sesssetup_ntlmssp_done(struct
tevent_req *subreq)
DATA_BLOB blob, blob_in, blob_out, spnego_blob;
bool ret;
- status
