The branch, master has been updated
via 171e87f s3:libsmb/clirap: remove unused cli_get_server_*() functions
via b74ff8c libcli/auth: remove unused variable in msrpc_parse()
via 68879fd security.idl: add SID_NT_NFS S-1-5-88* sids
via 3be06be selftest: Do not use the deprecated samba-tool user add
via 38b7bed s4-dsdb: Add missing header file for write() and close()
from 860d465 s4-torture: Add AES and RC4 enctype checks
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 171e87fae6a49c6077cceab129c243e7a68e4daa
Author: Stefan Metzmacher <me...@samba.org>
Date: Thu May 12 17:31:47 2016 +0200
s3:libsmb/clirap: remove unused cli_get_server_*() functions
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Ralph Boehme <s...@samba.org>
Autobuild-User(master): Stefan Metzmacher <me...@samba.org>
Autobuild-Date(master): Wed Jul 6 22:41:41 CEST 2016 on sn-devel-144
commit b74ff8c4daca399cf53dfcbc8e4038faaa7f301b
Author: Stefan Metzmacher <me...@samba.org>
Date: Mon May 9 16:14:04 2016 +0200
libcli/auth: remove unused variable in msrpc_parse()
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Ralph Boehme <s...@samba.org>
commit 68879fd18afc5d52ea21895a87bb0aadde5d98e3
Author: Stefan Metzmacher <me...@samba.org>
Date: Tue Jul 5 11:40:15 2016 +0200
security.idl: add SID_NT_NFS S-1-5-88* sids
Signed-off-by: Stefan Metzmacher <me...@samba.org>
Reviewed-by: Ralph Boehme <s...@samba.org>
commit 3be06be00f410a19c58fae9d35147675b160e0ee
Author: Andreas Schneider <a...@samba.org>
Date: Tue Jul 5 10:53:08 2016 +0200
selftest: Do not use the deprecated samba-tool user add
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Ralph Boehme <s...@samba.org>
commit 38b7bed93c6926a914a2eaeff4e9ffe1f2fcc6d7
Author: Andreas Schneider <a...@samba.org>
Date: Tue Jul 5 10:56:24 2016 +0200
s4-dsdb: Add missing header file for write() and close()
This fixes compilation with gcc 4.8.5.
Signed-off-by: Andreas Schneider <a...@samba.org>
Reviewed-by: Ralph Boehme <s...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
libcli/auth/msrpc_parse.c | 7 ---
librpc/idl/security.idl | 9 +++
selftest/target/Samba4.pm | 4 +-
source3/libsmb/clirap.h | 2 -
source3/libsmb/clirap2.c | 144 ---------------------------------------------
source4/dsdb/common/util.c | 1 +
6 files changed, 12 insertions(+), 155 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libcli/auth/msrpc_parse.c b/libcli/auth/msrpc_parse.c
index 74a7bcc..86ba2ec 100644
--- a/libcli/auth/msrpc_parse.c
+++ b/libcli/auth/msrpc_parse.c
@@ -243,14 +243,8 @@ bool msrpc_parse(TALLOC_CTX *mem_ctx,
uint16_t len1, len2;
uint32_t ptr;
uint32_t *v;
- size_t p_len = 1024;
- char *p = talloc_array(mem_ctx, char, p_len);
bool ret = true;
- if (!p) {
- return false;
- }
-
va_start(ap, format);
for (i=0; format[i]; i++) {
switch (format[i]) {
@@ -411,6 +405,5 @@ bool msrpc_parse(TALLOC_CTX *mem_ctx,
cleanup:
va_end(ap);
- talloc_free(p);
return ret;
}
diff --git a/librpc/idl/security.idl b/librpc/idl/security.idl
index f706efd..2ef4587 100644
--- a/librpc/idl/security.idl
+++ b/librpc/idl/security.idl
@@ -288,6 +288,15 @@ interface security
const string SID_AUTHENTICATION_AUTHORITY_ASSERTED_IDENTITY =
"S-1-18-1";
const string SID_SERVICE_ASSERTED_IDENTITY = "S-1-18-2";
+ /*
+ * http://technet.microsoft.com/en-us/library/hh509017(v=ws.10).aspx
+ */
+ const string SID_NT_NFS_SUBSYSTEM = "S-1-5-88";
+ const string SID_NT_NFS_USER = "S-1-5-88-1";
+ const string SID_NT_NFS_GROUP = "S-1-5-88-2";
+ const string SID_NT_NFS_MASK = "S-1-5-88-3";
+ const string SID_NT_NFS_OTHERS = "S-1-5-88-4";
+
/* well-known domain RIDs */
const int DOMAIN_RID_LOGON = 9;
const int DOMAIN_RID_ENTERPRISE_READONLY_DCS = 498;
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
index 731ad1f..7778615 100755
--- a/selftest/target/Samba4.pm
+++ b/selftest/target/Samba4.pm
@@ -728,7 +728,7 @@ sub provision_raw_step2($$$)
my $samba_tool_cmd = "";
$samba_tool_cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" ";
$samba_tool_cmd .= Samba::bindir_path($self, "samba-tool")
- . " user add --configfile=$ctx->{smb_conf} $testallowed_account
$ctx->{password}";
+ . " user create --configfile=$ctx->{smb_conf} $testallowed_account
$ctx->{password}";
unless (system($samba_tool_cmd) == 0) {
warn("Unable to add testallowed user: \n$samba_tool_cmd\n");
return undef;
@@ -768,7 +768,7 @@ servicePrincipalName: host/testallowed
$samba_tool_cmd = "";
$samba_tool_cmd .= "KRB5_CONFIG=\"$ret->{KRB5_CONFIG}\" ";
$samba_tool_cmd .= Samba::bindir_path($self, "samba-tool")
- . " user add --configfile=$ctx->{smb_conf} testdenied
$ctx->{password}";
+ . " user create --configfile=$ctx->{smb_conf} testdenied
$ctx->{password}";
unless (system($samba_tool_cmd) == 0) {
warn("Unable to add testdenied user: \n$samba_tool_cmd\n");
return undef;
diff --git a/source3/libsmb/clirap.h b/source3/libsmb/clirap.h
index a0d4d06..9140fb6 100644
--- a/source3/libsmb/clirap.h
+++ b/source3/libsmb/clirap.h
@@ -200,8 +200,6 @@ int cli_NetFileEnum(struct cli_state *cli, const char *
user,
int cli_NetShareAdd(struct cli_state *cli, struct rap_share_info_2 * sinfo );
int cli_NetShareDelete(struct cli_state *cli, const char * share_name );
bool cli_get_pdc_name(struct cli_state *cli, const char *workgroup, char
**pdc_name);
-bool cli_get_server_domain(struct cli_state *cli);
-bool cli_get_server_type(struct cli_state *cli, uint32_t *pstype);
bool cli_get_server_name(TALLOC_CTX *mem_ctx, struct cli_state *cli,
char **servername);
bool cli_ns_check_server_type(struct cli_state *cli, char *workgroup, uint32_t
stype);
diff --git a/source3/libsmb/clirap2.c b/source3/libsmb/clirap2.c
index 6c49363..3dd299c 100644
--- a/source3/libsmb/clirap2.c
+++ b/source3/libsmb/clirap2.c
@@ -1545,150 +1545,6 @@ bool cli_get_pdc_name(struct cli_state *cli, const char
*workgroup, char **pdc_n
return(count > 0);
}
-/*************************************************************************
-*
-* Function Name: cli_get_server_domain
-*
-* PURPOSE: Remotes a NetWkstaGetInfo API call to the current server
-* requesting wksta_info_10 level information to determine
-* the domain the server belongs to. On success, this
-* routine sets the server_domain field in the cli_state structure
-* to the server's domain name.
-*
-* Dependencies: none
-*
-* Parameters:
-* cli - pointer to cli_state structure
-*
-* Returns:
-* True - success
-* False - failure
-*
-* Origins: samba 2.0.6 source/libsmb/clientgen.c cli_NetServerEnum()
-*
-************************************************************************/
-
-bool cli_get_server_domain(struct cli_state *cli)
-{
- char *rparam = NULL;
- char *rdata = NULL;
- unsigned int rdrcnt,rprcnt;
- char *p;
- char param[WORDSIZE /* api number */
- +sizeof(RAP_WWkstaGetInfo_REQ) /* req string */
- +sizeof(RAP_WKSTA_INFO_L10) /* return string */
- +WORDSIZE /* info level */
- +WORDSIZE]; /* buffer size */
- int res = -1;
-
- /* send a SMBtrans command with api NetWkstaGetInfo */
- p = make_header(param, RAP_WWkstaGetInfo,
- RAP_WWkstaGetInfo_REQ, RAP_WKSTA_INFO_L10);
- PUTWORD(p, 10); /* info level */
- PUTWORD(p, CLI_BUFFER_SIZE);
-
- if (cli_api(cli, param, PTR_DIFF(p,param), 8, /* params, length, max */
- NULL, 0, CLI_BUFFER_SIZE, /* data, length, max
*/
- &rparam, &rprcnt, /* return params, return size
*/
- &rdata, &rdrcnt)) { /* return data, return size */
- char *endp = rparam + rprcnt;
- res = GETRES(rparam, endp);
-
- if (res == 0) {
- TALLOC_CTX *frame = talloc_stackframe();
- char *server_domain;
- int converter = 0;
-
- p = rparam + WORDSIZE;
- GETWORD(p, converter, endp);
-
- p = rdata + DWORDSIZE + DWORDSIZE; /* skip computer &
user names */
- endp = rdata + rdrcnt;
- p += rap_getstringp(frame,
- p,
- &server_domain,
- rdata,
- converter,
- endp);
-
- if (server_domain) {
- fstrcpy(cli->server_domain, server_domain);
- }
- TALLOC_FREE(frame);
- }
- }
-
- SAFE_FREE(rparam);
- SAFE_FREE(rdata);
-
- return(res == 0);
-}
-
-/*************************************************************************
-*
-* Function Name: cli_get_server_type
-*
-* PURPOSE: Remotes a NetServerGetInfo API call to the current server
-* requesting server_info_1 level information to retrieve
-* the server type.
-*
-* Dependencies: none
-*
-* Parameters:
-* cli - pointer to cli_state structure
-* pstype - pointer to uint32_t to contain returned server type
-*
-* Returns:
-* True - success
-* False - failure
-*
-* Origins: samba 2.0.6 source/libsmb/clientgen.c cli_NetServerEnum()
-*
-************************************************************************/
-
-bool cli_get_server_type(struct cli_state *cli, uint32_t *pstype)
-{
- char *rparam = NULL;
- char *rdata = NULL;
- unsigned int rdrcnt,rprcnt;
- char *p;
- char param[WORDSIZE /* api number */
- +sizeof(RAP_WserverGetInfo_REQ) /* req string */
- +sizeof(RAP_SERVER_INFO_L1) /* return string */
- +WORDSIZE /* info level */
- +WORDSIZE]; /* buffer size */
- int res = -1;
-
- /* send a SMBtrans command with api NetServerGetInfo */
- p = make_header(param, RAP_WserverGetInfo,
- RAP_WserverGetInfo_REQ, RAP_SERVER_INFO_L1);
- PUTWORD(p, 1); /* info level */
- PUTWORD(p, CLI_BUFFER_SIZE);
-
- if (cli_api(cli,
- param, PTR_DIFF(p,param), 8, /* params, length, max */
- NULL, 0, CLI_BUFFER_SIZE, /* data, length, max */
- &rparam, &rprcnt, /* return params, return size
*/
- &rdata, &rdrcnt /* return data, return size */
- )) {
- char *endp = rparam + rprcnt;
- res = GETRES(rparam,endp);
-
- if (res == 0 || res == ERRmoredata) {
- p = rdata;
- endp = rparam + rprcnt;
- p += 18;
- GETDWORD(p,*pstype,endp);
- *pstype &= ~SV_TYPE_LOCAL_LIST_ONLY;
- }
- }
-
- SAFE_FREE(rparam);
- SAFE_FREE(rdata);
-
- return(res == 0 || res == ERRmoredata);
-}
-
bool cli_get_server_name(TALLOC_CTX *mem_ctx, struct cli_state *cli,
char **servername)
{
diff --git a/source4/dsdb/common/util.c b/source4/dsdb/common/util.c
index 1c546d7..ed2dde3 100644
--- a/source4/dsdb/common/util.c
+++ b/source4/dsdb/common/util.c
@@ -39,6 +39,7 @@
#include "libcli/auth/libcli_auth.h"
#include "librpc/gen_ndr/ndr_drsblobs.h"
#include "system/locale.h"
+#include "system/filesys.h"
#include "lib/util/tsort.h"
#include "dsdb/common/util.h"
#include "lib/socket/socket.h"
--
Samba Shared Repository
